From b8ef35680529ddb941e1a5161503950d3cf745fe Mon Sep 17 00:00:00 2001 From: Jim Cromie Date: Thu, 26 Jan 2012 15:52:15 -0800 Subject: [PATCH] --- yaml --- r: 288775 b: refs/heads/master c: d976f7626627117c211137cd2aaf8c1656e6627d h: refs/heads/master i: 288773: 317262006f0a0ff27706eab8e19999381907c1b1 288771: eb878ace14ec96a8d48b97238377e9e86b32ff5b 288767: 8bd0fe749c98e67ee4150b6eaf3b66f361413ec0 v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/scx200_hrt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index de054d032d8e..f542cac2fa15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36f21f1ce419a552227b32d445e40c2d99286275 +refs/heads/master: d976f7626627117c211137cd2aaf8c1656e6627d diff --git a/trunk/drivers/clocksource/scx200_hrt.c b/trunk/drivers/clocksource/scx200_hrt.c index 27f4d9637b62..e4e4a04ab23f 100644 --- a/trunk/drivers/clocksource/scx200_hrt.c +++ b/trunk/drivers/clocksource/scx200_hrt.c @@ -71,7 +71,7 @@ static int __init init_hrt_clocksource(void) if (!request_region(scx200_cb_base + SCx200_TIMER_OFFSET, SCx200_TIMER_SIZE, "NatSemi SCx200 High-Resolution Timer")) { - printk(KERN_WARNING NAME ": unable to lock timer region\n"); + pr_warn("unable to lock timer region\n"); return -ENODEV; } @@ -88,7 +88,7 @@ static int __init init_hrt_clocksource(void) cs_hrt.mult = clocksource_hz2mult(HRT_FREQ + ppm, cs_hrt.shift); } - printk(KERN_INFO "enabling scx200 high-res timer (%s MHz +%d ppm)\n", + pr_info("enabling scx200 high-res timer (%s MHz +%d ppm)\n", mhz27 ? "27":"1", ppm); return clocksource_register(&cs_hrt);