diff options
-rw-r--r-- | drivers/mmc/core/core.c | 1 | ||||
-rw-r--r-- | include/linux/notifier.h | 10 | ||||
-rw-r--r-- | include/linux/suspend.h | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index f091b43d00c4..89bdeaec7182 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/log2.h> | 23 | #include <linux/log2.h> |
24 | #include <linux/regulator/consumer.h> | 24 | #include <linux/regulator/consumer.h> |
25 | #include <linux/pm_runtime.h> | 25 | #include <linux/pm_runtime.h> |
26 | #include <linux/suspend.h> | ||
26 | 27 | ||
27 | #include <linux/mmc/card.h> | 28 | #include <linux/mmc/card.h> |
28 | #include <linux/mmc/host.h> | 29 | #include <linux/mmc/host.h> |
diff --git a/include/linux/notifier.h b/include/linux/notifier.h index 145c43658db0..ae8f7d9f8def 100644 --- a/include/linux/notifier.h +++ b/include/linux/notifier.h | |||
@@ -191,15 +191,9 @@ static inline int notifier_to_errno(int ret) | |||
191 | 191 | ||
192 | /* reboot notifiers are defined in include/linux/reboot.h. */ | 192 | /* reboot notifiers are defined in include/linux/reboot.h. */ |
193 | 193 | ||
194 | #define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ | 194 | /* Hibernation and suspend events are defined in include/linux/suspend.h. */ |
195 | 195 | ||
196 | /* Hibernation and suspend events */ | 196 | #define NETLINK_URELEASE 0x0001 /* Unicast netlink socket released */ |
197 | #define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */ | ||
198 | #define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */ | ||
199 | #define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ | ||
200 | #define PM_POST_SUSPEND 0x0004 /* Suspend finished */ | ||
201 | #define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */ | ||
202 | #define PM_POST_RESTORE 0x0006 /* Restore failed */ | ||
203 | 197 | ||
204 | /* Console keyboard events. | 198 | /* Console keyboard events. |
205 | * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and | 199 | * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and |
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index e1e3742733be..6bbcef22e105 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
@@ -268,6 +268,14 @@ static inline int hibernate(void) { return -ENOSYS; } | |||
268 | static inline bool system_entering_hibernation(void) { return false; } | 268 | static inline bool system_entering_hibernation(void) { return false; } |
269 | #endif /* CONFIG_HIBERNATION */ | 269 | #endif /* CONFIG_HIBERNATION */ |
270 | 270 | ||
271 | /* Hibernation and suspend events */ | ||
272 | #define PM_HIBERNATION_PREPARE 0x0001 /* Going to hibernate */ | ||
273 | #define PM_POST_HIBERNATION 0x0002 /* Hibernation finished */ | ||
274 | #define PM_SUSPEND_PREPARE 0x0003 /* Going to suspend the system */ | ||
275 | #define PM_POST_SUSPEND 0x0004 /* Suspend finished */ | ||
276 | #define PM_RESTORE_PREPARE 0x0005 /* Going to restore a saved image */ | ||
277 | #define PM_POST_RESTORE 0x0006 /* Restore failed */ | ||
278 | |||
271 | #ifdef CONFIG_PM_SLEEP | 279 | #ifdef CONFIG_PM_SLEEP |
272 | void save_processor_state(void); | 280 | void save_processor_state(void); |
273 | void restore_processor_state(void); | 281 | void restore_processor_state(void); |