summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAdrian Bunk2006-03-29 00:04:00 +0200
committerLen Brown2006-04-02 04:07:42 +0200
commit1300124f69cafc54331bc06e968a8dd67863f989 (patch)
tree4f94d162680b699f159d04a1bcc6d793f3b8a23c /arch/x86_64
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
downloadkernel-qcow2-linux-1300124f69cafc54331bc06e968a8dd67863f989.tar.gz
kernel-qcow2-linux-1300124f69cafc54331bc06e968a8dd67863f989.tar.xz
kernel-qcow2-linux-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 'arch/x86_64')
-rw-r--r--arch/x86_64/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 4310b4a311a5..299d8740177a 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