X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Fmicroblaze%2Fkernel%2Ftimer.c;h=da9d1e56108b0d1bf006144b9f4e678493ab3898;hb=92ee8bd468b43938319d6ff51afb071b6e9ef758;hp=b1380ae93ae13ae8bf43f4993cdd18351d5de505;hpb=c206d44ffdd539f5f4553e1a92cc7711084c1d3c;p=net-next-2.6.git

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index b1380ae93ae..da9d1e56108 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -258,12 +258,12 @@ void __init time_init(void)
 				0
 			};
 #endif
-	char *timer_list[] = {
-				"xlnx,xps-timer-1.00.a",
-				"xlnx,opb-timer-1.00.b",
-				"xlnx,opb-timer-1.00.a",
-				NULL
-			};
+	const char * const timer_list[] = {
+		"xlnx,xps-timer-1.00.a",
+		"xlnx,opb-timer-1.00.b",
+		"xlnx,opb-timer-1.00.a",
+		NULL
+	};
 
 	for (i = 0; timer_list[i] != NULL; i++) {
 		timer = of_find_compatible_node(NULL, NULL, timer_list[i]);
@@ -278,7 +278,7 @@ void __init time_init(void)
 	timer_num =
 		*(int *) of_get_property(timer, "xlnx,one-timer-only", NULL);
 	if (timer_num) {
-		printk(KERN_EMERG "Please enable two timers in HW\n");
+		eprintk(KERN_EMERG "Please enable two timers in HW\n");
 		BUG();
 	}