diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-11 18:27:13 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-01-11 18:27:13 +0100 |
| commit | 02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04 (patch) | |
| tree | 33402107adad8ebca51ea843291e09afc11a67d7 /drivers/acpi | |
| parent | Pull bugzilla-8973 into release branch (diff) | |
| parent | PM: ACPI and APM must not be enabled at the same time (diff) | |
| download | linux-02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04.tar.xz linux-02d5bccf8ea3f9b8de21bfe19db77fbc50d92e04.zip | |
Pull bugzilla-9194 into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/bus.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 49d432d0a12c..d7a115c362d1 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -29,7 +29,6 @@ #include <linux/list.h> #include <linux/sched.h> #include <linux/pm.h> -#include <linux/pm_legacy.h> #include <linux/device.h> #include <linux/proc_fs.h> #ifdef CONFIG_X86 @@ -764,16 +763,14 @@ static int __init acpi_init(void) result = acpi_bus_init(); if (!result) { -#ifdef CONFIG_PM_LEGACY - if (!PM_IS_ACTIVE()) - pm_active = 1; + if (!(pm_flags & PM_APM)) + pm_flags |= PM_ACPI; else { printk(KERN_INFO PREFIX "APM is already active, exiting\n"); disable_acpi(); result = -ENODEV; } -#endif } else disable_acpi(); |