From 4607d1f752d0556e4a9f7280d4316a151815b6e5 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 22 Feb 2012 13:19:37 +0100 Subject: [PATCH] --- yaml --- r: 288799 b: refs/heads/master c: 10ea9d6f5663c3ed51f91cd037b4b9b147273cbb h: refs/heads/master i: 288797: bc81d1161960d0510a2c3c34261d6a3fb559bd6f 288795: 7c379901ba7c94d1e870e238ee9335af8b435922 288791: ac4e68bdc69392f8d72d4b17f32159f834887627 288783: 754389c78a7210b564e36db42b40865b357109c6 288767: 8bd0fe749c98e67ee4150b6eaf3b66f361413ec0 v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/scx200_hrt.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) 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); }