aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/bus.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-10 18:04:52 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2011-03-14 19:43:15 -0400
commitcd51e61cf4e8b220da37dc35e9c2dc2dc258b4de (patch)
treef2cb7a54e59b0bc238ac14f226214e0fc0817891 /drivers/acpi/bus.c
parentcb8f51bdadb7969139c2e39c2defd4cde98c1ea8 (diff)
PM / ACPI: Remove references to pm_flags from bus.c
If direct references to pm_flags are removed from drivers/acpi/bus.c, CONFIG_ACPI will not need to depend on CONFIG_PM any more. Make that happen. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r--drivers/acpi/bus.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 7ced61f39492..973b0709972c 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -40,6 +40,7 @@
40#include <acpi/acpi_bus.h> 40#include <acpi/acpi_bus.h>
41#include <acpi/acpi_drivers.h> 41#include <acpi/acpi_drivers.h>
42#include <linux/dmi.h> 42#include <linux/dmi.h>
43#include <linux/suspend.h>
43 44
44#include "internal.h" 45#include "internal.h"
45 46
@@ -1025,13 +1026,13 @@ static int __init acpi_init(void)
1025 1026
1026 if (!result) { 1027 if (!result) {
1027 pci_mmcfg_late_init(); 1028 pci_mmcfg_late_init();
1028 if (!(pm_flags & PM_APM)) 1029 if (pm_apm_enabled()) {
1029 pm_flags |= PM_ACPI;
1030 else {
1031 printk(KERN_INFO PREFIX 1030 printk(KERN_INFO PREFIX
1032 "APM is already active, exiting\n"); 1031 "APM is already active, exiting\n");
1033 disable_acpi(); 1032 disable_acpi();
1034 result = -ENODEV; 1033 result = -ENODEV;
1034 } else {
1035 pm_set_acpi_flag();
1035 } 1036 }
1036 } else 1037 } else
1037 disable_acpi(); 1038 disable_acpi();