diff --git a/[refs] b/[refs] index db7cdbfaf83b..5278c3ab9527 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0e5c77903fd717cc5eb02b7b8f5de3c869efc49 +refs/heads/master: 10ea9d6f5663c3ed51f91cd037b4b9b147273cbb diff --git a/trunk/drivers/clocksource/scx200_hrt.c b/trunk/drivers/clocksource/scx200_hrt.c index 60db8b1492f1..64f9e8294434 100644 --- a/trunk/drivers/clocksource/scx200_hrt.c +++ b/trunk/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); }