aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 15:35:57 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 15:35:57 -0400
commit1465887cfe79889273e3fd3aaf862e7ec3ee244f (patch)
tree210930f245d2bdd47b65480e11ed8ea24a564550
parent60e04a5c533785c23ce6b76a6e5058328fe68edb (diff)
parent1300124f69cafc54331bc06e968a8dd67863f989 (diff)
Pull Kconfig into release branch
-rw-r--r--arch/ia64/Kconfig1
-rw-r--r--arch/x86_64/Kconfig1
-rw-r--r--drivers/acpi/Kconfig3
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 0f3076a820c..f0252eda12a 100644
--- 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
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 408d44a5975..6527a368fb9 100644
--- 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
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c24652d31bf..2b2fbec1454 100644
--- 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