From 1b649962d1ed6e00fefc22243ff70ba30704823c Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 13 Sep 2010 21:23:49 -0700
Subject: [PATCH] --- yaml --- r: 217141 b: refs/heads/master c:
 92ee8bd468b43938319d6ff51afb071b6e9ef758 h: refs/heads/master i:   217139:
 84f60dabf9a6b27c4b19c63370f90bbc2ab9c631 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/microblaze/kernel/heartbeat.c | 10 +++++-----
 trunk/arch/microblaze/kernel/intc.c      |  2 +-
 trunk/arch/microblaze/kernel/timer.c     | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4407bc1b4adb..307f01c79a2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 099a2f4284eba5da2708d0e8fe0797dc095d47ca
+refs/heads/master: 92ee8bd468b43938319d6ff51afb071b6e9ef758
diff --git a/trunk/arch/microblaze/kernel/heartbeat.c b/trunk/arch/microblaze/kernel/heartbeat.c
index 522751737cfa..f8bc2d79ee35 100644
--- a/trunk/arch/microblaze/kernel/heartbeat.c
+++ b/trunk/arch/microblaze/kernel/heartbeat.c
@@ -47,11 +47,11 @@ void setup_heartbeat(void)
 	struct device_node *gpio = NULL;
 	int *prop;
 	int j;
-	char *gpio_list[] = {
-				"xlnx,xps-gpio-1.00.a",
-				"xlnx,opb-gpio-1.00.a",
-				NULL
-			};
+	const char * const gpio_list[] = {
+		"xlnx,xps-gpio-1.00.a",
+		"xlnx,opb-gpio-1.00.a",
+		NULL
+	};
 
 	for (j = 0; gpio_list[j] != NULL; j++) {
 		gpio = of_find_compatible_node(NULL, NULL, gpio_list[j]);
diff --git a/trunk/arch/microblaze/kernel/intc.c b/trunk/arch/microblaze/kernel/intc.c
index 03172c1da770..e1cf0819d753 100644
--- a/trunk/arch/microblaze/kernel/intc.c
+++ b/trunk/arch/microblaze/kernel/intc.c
@@ -126,7 +126,7 @@ void __init init_IRQ(void)
 				0
 			};
 #endif
-	static char *intc_list[] = {
+	const char * const intc_list[] = {
 				"xlnx,xps-intc-1.00.a",
 				"xlnx,opb-intc-1.00.c",
 				"xlnx,opb-intc-1.00.b",
diff --git a/trunk/arch/microblaze/kernel/timer.c b/trunk/arch/microblaze/kernel/timer.c
index ec7df67006ba..da9d1e56108b 100644
--- a/trunk/arch/microblaze/kernel/timer.c
+++ b/trunk/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]);