commit 57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919
author Pavel Machek <pavel@ucw.cz> Sat Sep 03 15:57:06 2005 -0700
committer Linus Torvalds <torvalds@evo.osdl.org> Mon Sep 05 00:06:18 2005 -0700
tree 916c1435e9cba3dd050e526637ee8bf51db140e8
parent 6161b2ce8116b9a623260ab811e2c035b3fac2e5

[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>

kernel/power/main.c

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 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
 };