From 1e9b2b10495128acf146056f60faad6a624b8af4 Mon Sep 17 00:00:00 2001
From: Andreas Mohr <andi@rhlx01.fht-esslingen.de>
Date: Sun, 25 Jun 2006 05:47:56 -0700
Subject: [PATCH] --- yaml --- r: 29717 b: refs/heads/master c:
 3b364b8d584b94777f8446a943b3c65e75e758f8 h: refs/heads/master i:   29715:
 02016956861ea43ffd7960e63b53f93e9f57edab v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/disk.c | 2 +-
 trunk/kernel/power/main.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 240427740ab6..4abdee5ef97d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43b0bc00fdbf2f1503a57f0c2c1338438c5d2805
+refs/heads/master: 3b364b8d584b94777f8446a943b3c65e75e758f8
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 81d4d982f3f0..e13e74067845 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -231,7 +231,7 @@ static int software_resume(void)
 late_initcall(software_resume);
 
 
-static char * pm_disk_modes[] = {
+static const char * const pm_disk_modes[] = {
 	[PM_DISK_FIRMWARE]	= "firmware",
 	[PM_DISK_PLATFORM]	= "platform",
 	[PM_DISK_SHUTDOWN]	= "shutdown",
diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c
index cdf0f07af92f..6d295c776794 100644
--- a/trunk/kernel/power/main.c
+++ b/trunk/kernel/power/main.c
@@ -145,7 +145,7 @@ static void suspend_finish(suspend_state_t state)
 
 
 
-static char *pm_states[PM_SUSPEND_MAX] = {
+static const char * const pm_states[PM_SUSPEND_MAX] = {
 	[PM_SUSPEND_STANDBY]	= "standby",
 	[PM_SUSPEND_MEM]	= "mem",
 #ifdef CONFIG_SOFTWARE_SUSPEND
@@ -262,7 +262,7 @@ static ssize_t state_show(struct subsystem * subsys, char * buf)
 static ssize_t state_store(struct subsystem * subsys, const char * buf, size_t n)
 {
 	suspend_state_t state = PM_SUSPEND_STANDBY;
-	char ** s;
+	const char * const *s;
 	char *p;
 	int error;
 	int len;