diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-28 16:46:13 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-28 16:46:13 +0900 |
| commit | e9bcd470d814473c31ffc5d09e249396a2196ad4 (patch) | |
| tree | bf96054f235eda984473d22b90339d38430465bb /arch/sh/drivers/pci/pcie-sh7786.c | |
| parent | bc404e9128dd69654f5fda6320fc6af4ee94474c (diff) | |
| parent | ad3337cb38bf1f4c677ce2d05f9c049b35f7147e (diff) | |
| download | lwn-e9bcd470d814473c31ffc5d09e249396a2196ad4.tar.gz lwn-e9bcd470d814473c31ffc5d09e249396a2196ad4.zip | |
Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus
Diffstat (limited to 'arch/sh/drivers/pci/pcie-sh7786.c')
| -rw-r--r-- | arch/sh/drivers/pci/pcie-sh7786.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c index c045142f7338..9e702f2f8045 100644 --- a/arch/sh/drivers/pci/pcie-sh7786.c +++ b/arch/sh/drivers/pci/pcie-sh7786.c @@ -239,7 +239,7 @@ static int __init pcie_clk_init(struct sh7786_pcie_port *port) clk->enable_reg = (void __iomem *)(chan->reg_base + SH4A_PCIEPHYCTLR); clk->enable_bit = BITS_CKE; - ret = sh_clk_mstp32_register(clk, 1); + ret = sh_clk_mstp_register(clk, 1); if (unlikely(ret < 0)) goto err_phy; |