---

yaml --- r: 288775 b: refs/heads/master c: d976f76 h: refs/heads/master i: 288773: 3172620 288771: eb878ac 288767: 8bd0fe7 v: v3
git-mirror · Feb 2, 2012 · b8ef356 · b8ef356
1 parent 97af3ce
commit b8ef356
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);