[PATCH 09/11] ACPI: remove ACPI dependency on PM

Bjorn Helgaas
2008-11-05T23:18:19Z

Allow ACPI to build without CONFIG_PM.

CONFIG_PM (power management) gives us things like suspend/resume
support. The device discovery and configuration functionality of
ACPI is still useful even without power management.

CC: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
---
drivers/acpi/Kconfig | 1 -
drivers/acpi/bus.c | 2 ++
2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 2e6f757..9530192 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -6,7 +6,6 @@ menuconfig ACPI
bool "ACPI (Advanced Configuration and Power Interface) Support"
depends on !IA64_HP_SIM
depends on IA64 || X86
- depends on PM
select PNP
default y
---help---
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 765fd1c..b9cb6eb 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -857,6 +857,7 @@ static int __init acpi_init(void)

if (!result) {
pci_mmcfg_late_init();
+#ifdef CONFIG_PM
if (!(pm_flags & PM_APM))
pm_flags |= PM_ACPI;
else {
@@ -865,6 +866,7 @@ static int __init acpi_init(void)
disable_acpi();
result = -ENODEV;
}
+#endif
} else
disable_acpi();
/*