diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 09:58:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-13 09:58:22 -0800 |
| commit | 417009f64f17d76322d148a2cda40dfec37bcf0b (patch) | |
| tree | 5c02e4888a083e276a49ec1f58cd492ca5532e1b /include/linux/pm_legacy.h | |
| parent | ba67a39efde8312e386c6f603054f8945433d91f (diff) | |
| parent | 55d1bb9a3b0f7f791ce597086791ebe54ea4c46a (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
pnpacpi: print resource shortage message only once
PM: ACPI and APM must not be enabled at the same time
ACPI: apply quirk_ich6_lpc_acpi to more ICH8 and ICH9
ACPICA: fix acpi_serialize hang regression
ACPI : Not register gsi for PCI IDE controller in legacy mode
ACPI: Reintroduce run time configurable max_cstate for !CPU_IDLE case
ACPI: Make sysfs interface in ACPI power optional.
ACPI: EC: Enable boot EC before bus_scan
increase PNP_MAX_PORT to 40 from 24
Diffstat (limited to 'include/linux/pm_legacy.h')
| -rw-r--r-- | include/linux/pm_legacy.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/pm_legacy.h b/include/linux/pm_legacy.h index 514729a44688..446f4f42b952 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) |