mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
Pull Kconfig into release branch
This commit is contained in:
commit
1465887cfe
3 changed files with 3 additions and 2 deletions
|
@ -77,6 +77,7 @@ choice
|
|||
config IA64_GENERIC
|
||||
bool "generic"
|
||||
select ACPI
|
||||
select PCI
|
||||
select NUMA
|
||||
select ACPI_NUMA
|
||||
help
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue