From: Andreas Mohr Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton --- kernel/power/disk.c | 2 +- kernel/power/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff -puN kernel/power/disk.c~constify-parts-of-kernel-power kernel/power/disk.c --- 25/kernel/power/disk.c~constify-parts-of-kernel-power Wed May 24 13:48:43 2006 +++ 25-akpm/kernel/power/disk.c Wed May 24 13:48:43 2006 @@ -214,7 +214,7 @@ static int software_resume(void) } -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 -puN kernel/power/main.c~constify-parts-of-kernel-power kernel/power/main.c --- 25/kernel/power/main.c~constify-parts-of-kernel-power Wed May 24 13:48:43 2006 +++ 25-akpm/kernel/power/main.c Wed May 24 13:48:43 2006 @@ -143,7 +143,7 @@ static void suspend_finish(suspend_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 @@ -260,7 +260,7 @@ static ssize_t state_show(struct subsyst 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; _