Pull Kconfig into release branch

1465887c · Len Brown · 60e04a5c · 1300124f · 1465887c · 1465887c
显示空白变更内容
内联并排

Showing with 3 addition and 2 deletion

arch/ia64/Kconfig arch/ia64/Kconfig +1 -0

arch/x86_64/Kconfig arch/x86_64/Kconfig +1 -0

drivers/acpi/Kconfig drivers/acpi/Kconfig +1 -2

未找到文件。
--- 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

--- 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

--- 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