summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-03-28 17:04:00 -0500
committerLen Brown <len.brown@intel.com>2006-04-01 21:07:42 -0500
commit1300124f69cafc54331bc06e968a8dd67863f989 (patch)
tree4f94d162680b699f159d04a1bcc6d793f3b8a23c /drivers/acpi
parent683aa4012f53b2ada0f430487e05d37b0d94e90a (diff)
downloadlinux-stable-1300124f69cafc54331bc06e968a8dd67863f989.tar.gz
linux-stable-1300124f69cafc54331bc06e968a8dd67863f989.tar.bz2
linux-stable-1300124f69cafc54331bc06e968a8dd67863f989.zip
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 5cb96300eb0f..932583da43a5 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