Pull Kconfig into release branch

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 0f3076a820c3af7dd7c71790be13e212354b3e1a..f0252eda12a8e08f0c6682e89ff796238e8f7739 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -77,6 +77,7 @@ choice
 config IA64_GENERIC
        bool "generic"
        select ACPI
+       select PCI
        select NUMA
        select ACPI_NUMA
        help

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 408d44a59756f8050c4455fdbb471eb9c9881f09..6527a368fb9ca786489ec6ce9bb39e935aaf2b37 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -299,6 +299,7 @@ config X86_64_ACPI_NUMA
        bool "ACPI NUMA detection"
        depends on NUMA
        select ACPI 
+       select PCI
        select ACPI_NUMA
        default y
        help

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c24652d31bf9b6f2fe763ecd20546fe047729e84..2b2fbec14540f8f27d8de0ec5b3b796f226d27c0 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"
 config ACPI
        bool "ACPI Support"
        depends on IA64 || X86
+       depends on PCI
        select PM
-       select PCI
-
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for