From: Pavel Machek <pavel@ucw.cz>
Date: Sat, 3 Sep 2005 22:57:06 +0000 (-0700)
Subject: [PATCH] pm: clean up /sys/power/disk
X-Git-Tag: v2.6.14-rc1~827
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919;p=linux-2.6

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

diff --git a/kernel/power/main.c b/kernel/power/main.c
index 71aa0fd220..22bdc93cc0 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
 };