Merge tag 'md/3.17' of git://neil.brown.name/md

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / kernel / power / power.h

diff --git a/kernel/power/power.h b/kernel/power/power.h
index c60f13b..5d49dca 100644 (file)
--- a/kernel/power/power.h
+++ b/kernel/power/power.h
@@ -178,13 +178,8 @@ extern void swsusp_show_speed(struct timeval *, struct timeval *,
                                unsigned int, char *);
 
 #ifdef CONFIG_SUSPEND
-struct pm_sleep_state {
-       const char *label;
-       suspend_state_t state;
-};
-
 /* kernel/power/suspend.c */
-extern struct pm_sleep_state pm_states[];
+extern const char *pm_states[];
 
 extern int suspend_devices_and_enter(suspend_state_t state);
 #else /* !CONFIG_SUSPEND */