summaryrefslogtreecommitdiffstats
path: root/arch/mips/lantiq/xway/sysctrl.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-12-16 11:04:49 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-12-16 11:04:49 +0100
commit348324c5b10bcba8d9daabdfb85a6927311be34f (patch)
treed06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /arch/mips/lantiq/xway/sysctrl.c
parentInput: pmic8xxx-pwrkey - migrate to regmap APIs (diff)
parentLinux 3.13-rc4 (diff)
downloadlinux-348324c5b10bcba8d9daabdfb85a6927311be34f.tar.xz
linux-348324c5b10bcba8d9daabdfb85a6927311be34f.zip
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and new hwmon API.
Diffstat (limited to 'arch/mips/lantiq/xway/sysctrl.c')
-rw-r--r--arch/mips/lantiq/xway/sysctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
index c24924fe087d..51804b10a036 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -128,7 +128,7 @@ static int pmu_enable(struct clk *clk)
do {} while (--retry && (pmu_r32(PWDSR(clk->module)) & clk->bits));
if (!retry)
- panic("activating PMU module failed!\n");
+ panic("activating PMU module failed!");
return 0;
}