aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-01-11 12:27:13 -0500
committerLen Brown <len.brown@intel.com>2008-01-11 12:27:13 -0500
commit02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04 (patch)
tree33402107adad8ebca51ea843291e09afc11a67d7 /include
parenteba6860ac5f9578e3ba6d0f9900cfc72599c5d66 (diff)
parent9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a (diff)
Pull bugzilla-9194 into release branch
Diffstat (limited to 'include')
-rw-r--r--include/linux/pm.h9
-rw-r--r--include/linux/pm_legacy.h6
2 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h
index 09a309b7b5d..b78e0295adf 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -246,6 +246,15 @@ static inline int call_platform_enable_wakeup(struct device *dev, int is_on)
device_set_wakeup_enable(dev,val); \
} while(0)
+/*
+ * Global Power Management flags
+ * Used to keep APM and ACPI from both being active
+ */
+extern unsigned int pm_flags;
+
+#define PM_APM 1
+#define PM_ACPI 2
+
#endif /* __KERNEL__ */
#endif /* _LINUX_PM_H */
diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h
index 514729a4468..446f4f42b95 100644
--- a/include/linux/pm_legacy.h
+++ b/include/linux/pm_legacy.h
@@ -4,10 +4,6 @@
#ifdef CONFIG_PM_LEGACY
-extern int pm_active;
-
-#define PM_IS_ACTIVE() (pm_active != 0)
-
/*
* Register a device with power management
*/
@@ -21,8 +17,6 @@ int __deprecated pm_send_all(pm_request_t rqst, void *data);
#else /* CONFIG_PM_LEGACY */
-#define PM_IS_ACTIVE() 0
-
static inline struct pm_dev *pm_register(pm_dev_t type,
unsigned long id,
pm_callback callback)