diff options
| author |   James Morris <james.l.morris@oracle.com> | 2012-08-17 20:42:30 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-08-17 20:42:30 +1000 |
| commit | 51b743fe87d7fb3dba7a2ff4a1fe23bb65dc2245 (patch) | |
| tree | f8b8f601713a3ecb264eb9f145636343d9350520 /arch/sh/kernel/cpu/sh4a/clock-sh7722.c | |
| parent | ptrace: mark __ptrace_may_access() static (diff) | |
| parent | Linux 3.6-rc2 (diff) | |
| download | linux-dev-51b743fe87d7fb3dba7a2ff4a1fe23bb65dc2245.tar.xz linux-dev-51b743fe87d7fb3dba7a2ff4a1fe23bb65dc2245.zip | |
Merge tag 'v3.6-rc2' into next
Linux 3.6-rc2
Resync with Linus.
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/clock-sh7722.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c index 8e1f97010c0d..c4cb740e4d10 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c @@ -261,7 +261,7 @@ int __init arch_clk_init(void) ret = sh_clk_div6_register(div6_clks, DIV6_NR); if (!ret) - ret = sh_clk_mstp32_register(mstp_clks, HWBLK_NR); + ret = sh_clk_mstp_register(mstp_clks, HWBLK_NR); return ret; } |