summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-02-22 13:19:37 +0100
committerIngo Molnar <mingo@elte.hu>2012-02-22 13:25:16 +0100
commit10ea9d6f5663c3ed51f91cd037b4b9b147273cbb (patch)
tree5ceb7d0252f029650b3d0d4d955089be5bc43436
parentb0e5c77903fd717cc5eb02b7b8f5de3c869efc49 (diff)
downloadop-kernel-dev-10ea9d6f5663c3ed51f91cd037b4b9b147273cbb.zip
op-kernel-dev-10ea9d6f5663c3ed51f91cd037b4b9b147273cbb.tar.gz
clocksource: scx200_hrt: Fix the build
This commit: 12d6d41276de: clocksource: scx200_hrt: Convert scx200 to use clocksource_register_hz Breaks the build on x86-32: drivers/clocksource/scx200_hrt.c: In function ‘init_hrt_clocksource’: drivers/clocksource/scx200_hrt.c:95:0: error: unterminated argument list invoking macro "pr_info" drivers/clocksource/scx200_hrt.c:84:2: error: ‘pr_info’ undeclared (first use in this function) It could not possibly have been build tested, because it had this mismerge: pr_info("enabling scx200 high-res timer (%s MHz +%d ppm)\n", printk(KERN_INFO "enabling scx200 high-res timer (%s MHz +%d ppm)\n", mhz27 ? "27":"1", ppm); Cc: Jim Cromie <jim.cromie@gmail.com> Cc: John Stultz <john.stultz@linaro.org> Link: http://lkml.kernel.org/n/tip-jceb26fns5w7tv8edlivhxpa@git.kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--drivers/clocksource/scx200_hrt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clocksource/scx200_hrt.c b/drivers/clocksource/scx200_hrt.c
index 60db8b1..64f9e82 100644
--- a/drivers/clocksource/scx200_hrt.c
+++ b/drivers/clocksource/scx200_hrt.c
@@ -81,9 +81,7 @@ static int __init init_hrt_clocksource(void)
if (mhz27)
freq *= 27;
- pr_info("enabling scx200 high-res timer (%s MHz +%d ppm)\n",
- printk(KERN_INFO "enabling scx200 high-res timer (%s MHz +%d ppm)\n",
- mhz27 ? "27":"1", ppm);
+ pr_info("enabling scx200 high-res timer (%s MHz +%d ppm)\n", mhz27 ? "27":"1", ppm);
return clocksource_register_hz(&cs_hrt, freq);
}
OpenPOWER on IntegriCloud