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/kernel/cpu/sh4a/clock-sh7786.c | |
| parent | bc404e9128dd69654f5fda6320fc6af4ee94474c (diff) | |
| parent | ad3337cb38bf1f4c677ce2d05f9c049b35f7147e (diff) | |
| download | linux-stable-e9bcd470d814473c31ffc5d09e249396a2196ad4.tar.gz linux-stable-e9bcd470d814473c31ffc5d09e249396a2196ad4.tar.bz2 linux-stable-e9bcd470d814473c31ffc5d09e249396a2196ad4.zip | |
Merge branches 'sh/urgent' and 'sh/trivial' into sh-fixes-for-linus
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/clock-sh7786.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7786.c b/arch/sh/kernel/cpu/sh4a/clock-sh7786.c index 491709483e10..8bba6f159023 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7786.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7786.c @@ -194,7 +194,7 @@ int __init arch_clk_init(void) ret = sh_clk_div4_register(div4_clks, ARRAY_SIZE(div4_clks), &div4_table); if (!ret) - ret = sh_clk_mstp32_register(mstp_clks, MSTP_NR); + ret = sh_clk_mstp_register(mstp_clks, MSTP_NR); return ret; } |