Merge linux-2.6 with linux-acpi-2.6

[~andy/linux] / arch / i386 / Kconfig

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 5d51b38bd70d2d0bdc86ed14ee613e3f4786c993..b22f003eaa6d782c02523685501a22753c28a50e 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1212,7 +1212,6 @@ config PCI_DIRECT
 config PCI_MMCONFIG
        bool
        depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
-       select ACPI_BOOT
        default y
 
 source "drivers/pci/pcie/Kconfig"