aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/clock-sh73a0.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-11 23:01:33 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-11 23:01:33 +0200
commit992c91eeca5fc7249de6afbba49064640f620d4a (patch)
treea1c1ed65f916757df41b9960f9224854d2a1f2fd /arch/arm/mach-shmobile/clock-sh73a0.c
parent31400bb56c0a6e55cd1e8f427f5ffcff2befcac4 (diff)
parent8f45b112fc66ef6869ccca4c3966976982f496a9 (diff)
downloadlinux-linaro-stable-992c91eeca5fc7249de6afbba49064640f620d4a.tar.gz
Merge branch 'renesas-soc-core' into renesas-soc
* renesas-soc-core: ARM: shmobile: soc-core: add R-mobile PM domain common APIs ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register ARM: shmobile: add common DMAEngine definitions ARM: shmobile: add common extra gpio functions Conflicts: arch/arm/mach-shmobile/clock-r8a7740.c
Diffstat (limited to 'arch/arm/mach-shmobile/clock-sh73a0.c')
-rw-r--r--arch/arm/mach-shmobile/clock-sh73a0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index ad6f9ade7402..f88eb1608377 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -614,7 +614,7 @@ void __init sh73a0_clock_init(void)
ret = sh_clk_div6_reparent_register(div6_clks, DIV6_NR);
if (!ret)
- ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR);
+ ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
for (k = 0; !ret && (k < ARRAY_SIZE(late_main_clks)); k++)
ret = clk_register(late_main_clks[k]);