X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fpm.h;fp=include%2Flinux%2Fpm.h;h=b78e0295adf4342732b42d8ffd588a48771e2b79;hb=9f9adecd2d0e4f88fa0e8cb06c6ec207748df70a;hp=09a309b7b5d2d4565b48b1eb5f59acd5c13265fe;hpb=da8cadb31b82c9d41fc593c8deab6aa20b162d6b;p=linux-2.6-omap-h63xx.git

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 */