diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-15 15:35:57 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:35:57 -0400 |
| commit | 1465887cfe79889273e3fd3aaf862e7ec3ee244f (patch) | |
| tree | 210930f245d2bdd47b65480e11ed8ea24a564550 | |
| parent | 60e04a5c533785c23ce6b76a6e5058328fe68edb (diff) | |
| parent | 1300124f69cafc54331bc06e968a8dd67863f989 (diff) | |
Pull Kconfig into release branch
| -rw-r--r-- | arch/ia64/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86_64/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/acpi/Kconfig | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 0f3076a820c3..f0252eda12a8 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -77,6 +77,7 @@ choice | |||
| 77 | config IA64_GENERIC | 77 | config IA64_GENERIC |
| 78 | bool "generic" | 78 | bool "generic" |
| 79 | select ACPI | 79 | select ACPI |
| 80 | select PCI | ||
| 80 | select NUMA | 81 | select NUMA |
| 81 | select ACPI_NUMA | 82 | select ACPI_NUMA |
| 82 | help | 83 | help |
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 408d44a59756..6527a368fb9c 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
| @@ -299,6 +299,7 @@ config X86_64_ACPI_NUMA | |||
| 299 | bool "ACPI NUMA detection" | 299 | bool "ACPI NUMA detection" |
| 300 | depends on NUMA | 300 | depends on NUMA |
| 301 | select ACPI | 301 | select ACPI |
| 302 | select PCI | ||
| 302 | select ACPI_NUMA | 303 | select ACPI_NUMA |
| 303 | default y | 304 | default y |
| 304 | help | 305 | help |
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index c24652d31bf9..2b2fbec14540 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support" | |||
| 10 | config ACPI | 10 | config ACPI |
| 11 | bool "ACPI Support" | 11 | bool "ACPI Support" |
| 12 | depends on IA64 || X86 | 12 | depends on IA64 || X86 |
| 13 | depends on PCI | ||
| 13 | select PM | 14 | select PM |
| 14 | select PCI | ||
| 15 | |||
| 16 | default y | 15 | default y |
| 17 | ---help--- | 16 | ---help--- |
| 18 | Advanced Configuration and Power Interface (ACPI) support for | 17 | Advanced Configuration and Power Interface (ACPI) support for |