diff --git a/[refs] b/[refs]
index b2df9d413ab4..fbdb8cff2c62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6161b2ce8116b9a623260ab811e2c035b3fac2e5
+refs/heads/master: 57c4ce3cbfba1bb0da7f37b9328a713cbd5d0919
diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c
index 71aa0fd22007..22bdc93cc038 100644
--- a/trunk/kernel/power/main.c
+++ b/trunk/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
 };