summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-09-03 15:57:06 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:06:18 -0700
commit57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919 (patch)
tree916c1435e9cba3dd050e526637ee8bf51db140e8 /kernel
parent6161b2ce8116b9a623260ab811e2c035b3fac2e5 (diff)
downloadop-kernel-dev-57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919.zip
op-kernel-dev-57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919.tar.gz
[PATCH] pm: clean up /sys/power/disk
Clean code up a bit, and only show suspend to disk as available when it is configured in. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 71aa0fd..22bdc93 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -143,11 +143,12 @@ static void suspend_finish(suspend_state_t state)
-static char * pm_states[] = {
+static char *pm_states[PM_SUSPEND_MAX] = {
[PM_SUSPEND_STANDBY] = "standby",
[PM_SUSPEND_MEM] = "mem",
+#ifdef CONFIG_SOFTWARE_SUSPEND
[PM_SUSPEND_DISK] = "disk",
- NULL,
+#endif
};
OpenPOWER on IntegriCloud