From 8838eeefb075612fd106cccedcdc39bc441ff216 Mon Sep 17 00:00:00 2001
From: Amerigo Wang <amwang@redhat.com>
Date: Mon, 25 Jul 2011 17:13:11 -0700
Subject: [PATCH] --- yaml --- r: 259007 b: refs/heads/master c:
 35eb6db11ed9cbf9702ec90a28779a51fe4a21a9 h: refs/heads/master i:   259005:
 6fc05674469c7aea83841bcfb2d3ab3bba10d98c   259003:
 a0b0dbb2fcdcdcb614274c9408431245e40155d8   258999:
 71343236915a60ae281b0056e9e45280c0c4b991   258991:
 09478d838782514fa89882f8e9f108602ddf480a   258975:
 63a72844a5d51e64d2a867718be88dfc2baa3b92   258943:
 d7d5e59dbf2b9104d832349b72d8386bf96ac7ec v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/mmc/core/core.c  |  1 +
 trunk/include/linux/notifier.h | 10 ++--------
 trunk/include/linux/suspend.h  |  8 ++++++++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index be4fde7c0799..dd5fa6fa6d69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5f41752fd37979dbaec61dc59c7ece0606ddf7e
+refs/heads/master: 35eb6db11ed9cbf9702ec90a28779a51fe4a21a9
diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c
index f091b43d00c4..89bdeaec7182 100644
--- a/trunk/drivers/mmc/core/core.c
+++ b/trunk/drivers/mmc/core/core.c
@@ -23,6 +23,7 @@
 #include <linux/log2.h>
 #include <linux/regulator/consumer.h>
 #include <linux/pm_runtime.h>
+#include <linux/suspend.h>
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
diff --git a/trunk/include/linux/notifier.h b/trunk/include/linux/notifier.h
index 145c43658db0..ae8f7d9f8def 100644
--- a/trunk/include/linux/notifier.h
+++ b/trunk/include/linux/notifier.h
@@ -191,15 +191,9 @@ static inline int notifier_to_errno(int ret)
 
 /* reboot notifiers are defined in include/linux/reboot.h. */
 
-#define NETLINK_URELEASE	0x0001	/* Unicast netlink socket released */
+/* Hibernation and suspend events are defined in include/linux/suspend.h. */
 
-/* Hibernation and suspend events */
-#define PM_HIBERNATION_PREPARE	0x0001 /* Going to hibernate */
-#define PM_POST_HIBERNATION	0x0002 /* Hibernation finished */
-#define PM_SUSPEND_PREPARE	0x0003 /* Going to suspend the system */
-#define PM_POST_SUSPEND		0x0004 /* Suspend finished */
-#define PM_RESTORE_PREPARE	0x0005 /* Going to restore a saved image */
-#define PM_POST_RESTORE		0x0006 /* Restore failed */
+#define NETLINK_URELEASE	0x0001	/* Unicast netlink socket released */
 
 /* Console keyboard events.
  * Note: KBD_KEYCODE is always sent before KBD_UNBOUND_KEYCODE, KBD_UNICODE and
diff --git a/trunk/include/linux/suspend.h b/trunk/include/linux/suspend.h
index e1e3742733be..6bbcef22e105 100644
--- a/trunk/include/linux/suspend.h
+++ b/trunk/include/linux/suspend.h
@@ -268,6 +268,14 @@ static inline int hibernate(void) { return -ENOSYS; }
 static inline bool system_entering_hibernation(void) { return false; }
 #endif /* CONFIG_HIBERNATION */
 
+/* Hibernation and suspend events */
+#define PM_HIBERNATION_PREPARE	0x0001 /* Going to hibernate */
+#define PM_POST_HIBERNATION	0x0002 /* Hibernation finished */
+#define PM_SUSPEND_PREPARE	0x0003 /* Going to suspend the system */
+#define PM_POST_SUSPEND		0x0004 /* Suspend finished */
+#define PM_RESTORE_PREPARE	0x0005 /* Going to restore a saved image */
+#define PM_POST_RESTORE		0x0006 /* Restore failed */
+
 #ifdef CONFIG_PM_SLEEP
 void save_processor_state(void);
 void restore_processor_state(void);