patch-2.3.49 linux/include/linux/pm.h

Next file: linux/include/linux/udf_167.h
Previous file: linux/include/linux/pkt_sched.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.48/linux/include/linux/pm.h linux/include/linux/pm.h
@@ -106,7 +106,7 @@
 	struct list_head entry;
 };
 
-#if defined(CONFIG_ACPI) || defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
+#ifdef CONFIG_PM
 
 extern int pm_active;
 
@@ -147,7 +147,7 @@
 extern inline void pm_access(struct pm_dev *dev) {}
 extern inline void pm_dev_idle(struct pm_dev *dev) {}
 
-#else /* CONFIG_ACPI || CONFIG_APM || CONFIG_APM_MODULE */
+#else /* CONFIG_PM */
 
 #define PM_IS_ACTIVE() 0
 
@@ -180,7 +180,7 @@
 extern inline void pm_access(struct pm_dev *dev) {}
 extern inline void pm_dev_idle(struct pm_dev *dev) {}
 
-#endif /* CONFIG_ACPI || CONFIG_APM || CONFIG_APM_MODULE */
+#endif /* CONFIG_PM */
 
 extern void (*pm_idle)(void);
 extern void (*pm_power_off)(void);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)