浏览代码

Pull Kconfig into release branch

Len Brown 19 年之前
父节点
当前提交
1465887cfe
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      arch/ia64/Kconfig
  2. 1 0
      arch/x86_64/Kconfig
  3. 1 2
      drivers/acpi/Kconfig

+ 1 - 0
arch/ia64/Kconfig

@@ -77,6 +77,7 @@ choice
 config IA64_GENERIC
 	bool "generic"
 	select ACPI
+	select PCI
 	select NUMA
 	select ACPI_NUMA
 	help

+ 1 - 0
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

+ 1 - 2
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