diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 20:39:54 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 20:39:54 +0200 |
| commit | 2f7d41217ba2bcdcd4f79e95f20f99074d87ac8c (patch) | |
| tree | f2c9a82d4722fc7e04285a0f5393a6d9f8d848ea /arch/arm/mach-shmobile/clock-r8a7740.c | |
| parent | d7de938f3da618b1592427f625e150c0a68b9ecb (diff) | |
| parent | 8f45b112fc66ef6869ccca4c3966976982f496a9 (diff) | |
Merge branch 'renesas-soc-core' into renesas-r8a7740
* 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
Conflicts:
arch/arm/mach-shmobile/clock-r8a7740.c
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r8a7740.c')
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7740.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c index daf3eace5dcf..ad5fccc7b5e7 100644 --- a/arch/arm/mach-shmobile/clock-r8a7740.c +++ b/arch/arm/mach-shmobile/clock-r8a7740.c @@ -636,7 +636,7 @@ void __init r8a7740_clock_init(u8 md_ck) DIV6_REPARENT_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]); |