diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /include/linux/pm.h | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 4d0a950a9..1a4205a9d 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -106,7 +106,7 @@ struct pm_dev 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 @@ struct pm_dev *pm_find(pm_dev_t type, struct pm_dev *from); 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 struct pm_dev *pm_find(pm_dev_t type, struct pm_dev *from) 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); |