[ACPI] delete CONFIG_ACPI_PCI

[linux-2.6] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 83cac52308db4f37a90583515292b59ca05653c2..3998c9d35fe19ee59014ae24b17e394f1d4f4581 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -3,7 +3,6 @@
 #
 
 menu "ACPI (Advanced Configuration and Power Interface) Support"
-       depends on PM
        depends on !X86_VISWS
        depends on !IA64_HP_SIM
        depends on IA64 || X86
@@ -11,6 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"
 config ACPI
        bool "ACPI Support"
        depends on IA64 || X86
+       select PM
+       select PCI
 
        default y
        ---help---
@@ -281,10 +282,6 @@ config ACPI_POWER
        bool
        default y
 
-config ACPI_PCI
-       bool
-       default PCI
-
 config ACPI_SYSTEM
        bool
        default y