diff options
author | Andreas Mohr <andi@rhlx01.fht-esslingen.de> | 2006-06-25 14:47:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 19:01:08 +0200 |
commit | 3b364b8d584b94777f8446a943b3c65e75e758f8 (patch) | |
tree | 423b5a0f5b8ea77deffa053443911b226fcb0ab1 /kernel/power/main.c | |
parent | [PATCH] cpuset: remove extra cpuset_zone_allowed check in __alloc_pages (diff) | |
download | linux-3b364b8d584b94777f8446a943b3c65e75e758f8.tar.xz linux-3b364b8d584b94777f8446a943b3c65e75e758f8.zip |
[PATCH] constify parts of kernel/power/
Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
-rw-r--r-- | kernel/power/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index cdf0f07af92f..6d295c776794 100644 --- a/kernel/power/main.c +++ b/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; |