diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-03-28 17:04:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-04-01 21:07:42 -0500 |
| commit | 1300124f69cafc54331bc06e968a8dd67863f989 (patch) | |
| tree | 4f94d162680b699f159d04a1bcc6d793f3b8a23c | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
ACPI: Kconfig: ACPI should depend on, not select PCI
Otherwise, illegal configurations like X86_VOYAGER=y, PCI=y are
possible.
This patch also fixes the options select'ing ACPI to also select PCI.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
| -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 edffe25a477..0046020e73b 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 4310b4a311a..299d8740177 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig @@ -289,6 +289,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 5cb96300eb0..932583da43a 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 |