Skip to contentSkip to conversation

ACPI should depend on, not select PCI

PATCH New [email protected] 1 participant 1 message Mar 8, 2006 ACPI

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 21/22 ACPI should depend on, not select PCI

From: Adrian Bunk <[email protected]>

ACPI should depend on, not select PCI.

Otherwise, illegal configurations like X86_VOYAGER=y, PCI=y are possible.

This patch also fixes the options select'ing ACPI to also select PCI.

Signed-off-by Adrian Bunk <[email protected]>
Cc "Brown, Len" <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 arch/ia64/Kconfig    |    1 +
 arch/x86_64/Kconfig  |    1 +
 drivers/acpi/Kconfig |    3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)
arch/ia64/Kconfig renamed from arch/ia64/Kconfig~acpi-should-depend-on-not-select-pci +1 -0
diff -puN arch/ia64/Kconfig~acpi-should-depend-on-not-select-pci arch/ia64/Kconfig
@@ -69,6 +69,7 @@ choice
 config IA64_GENERIC
 	bool "generic"
 	select ACPI
+	select PCI
 	select NUMA
 	select ACPI_NUMA
 	help
arch/x86_64/Kconfig renamed from arch/x86_64/Kconfig~acpi-should-depend-on-not-select-pci +1 -0
diff -puN arch/x86_64/Kconfig~acpi-should-depend-on-not-select-pci arch/x86_64/Kconfig
@@ -276,6 +276,7 @@ config X86_64_ACPI_NUMA
        bool "ACPI NUMA detection"
        depends on NUMA
        select ACPI 
+	select PCI
        select ACPI_NUMA
        default y
        help
drivers/acpi/Kconfig renamed from drivers/acpi/Kconfig~acpi-should-depend-on-not-select-pci +1 -2
diff -puN drivers/acpi/Kconfig~acpi-should-depend-on-not-select-pci drivers/acpi/Kconfig
@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and P
 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

_