Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / kernel / power / disk.c

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 81d4d982f3f097f55f02f427381f8871cac6f8cf..e13e740678456c6e20e97af70724fdebe2106dcd 100644 (file)
--- a/kernel/power/disk.c
+++ b/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",