1 files changed, 10 insertions, 1 deletions

diff --git a/include/linux/pm.h b/include/linux/pm.h
index 09a309b7b5d2..eccf59ea2a77 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -95,7 +95,7 @@ struct pm_dev
 };
 
 /* Functions above this comment are list-based old-style power
- * managment. Please avoid using them.  */
+ * management. Please avoid using them.  */
 
 /*
  * Callbacks for platform drivers to implement.
@@ -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 */