提交 1465887c 编写于 作者: L Len Brown

Pull Kconfig into release branch

...@@ -77,6 +77,7 @@ choice ...@@ -77,6 +77,7 @@ choice
config IA64_GENERIC config IA64_GENERIC
bool "generic" bool "generic"
select ACPI select ACPI
select PCI
select NUMA select NUMA
select ACPI_NUMA select ACPI_NUMA
help help
......
...@@ -299,6 +299,7 @@ config X86_64_ACPI_NUMA ...@@ -299,6 +299,7 @@ config X86_64_ACPI_NUMA
bool "ACPI NUMA detection" bool "ACPI NUMA detection"
depends on NUMA depends on NUMA
select ACPI select ACPI
select PCI
select ACPI_NUMA select ACPI_NUMA
default y default y
help help
......
...@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support" ...@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"
config ACPI config ACPI
bool "ACPI Support" bool "ACPI Support"
depends on IA64 || X86 depends on IA64 || X86
depends on PCI
select PM select PM
select PCI
default y default y
---help--- ---help---
Advanced Configuration and Power Interface (ACPI) support for Advanced Configuration and Power Interface (ACPI) support for
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册