summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu2010-02-24 21:39:37 +0100
committerH. Peter Anvin2010-02-25 23:26:43 +0100
commit722a639fd2cec44501c04ae32af57fd822c5a2d5 (patch)
treec1916245e4c2bb9c27f48053e57e1d151fa1aa2c
parentx86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI (diff)
downloadkernel-qcow2-linux-722a639fd2cec44501c04ae32af57fd822c5a2d5.tar.gz
kernel-qcow2-linux-722a639fd2cec44501c04ae32af57fd822c5a2d5.tar.xz
kernel-qcow2-linux-722a639fd2cec44501c04ae32af57fd822c5a2d5.zip
x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n
If we don't have any Moorestown CPU support compiled in, we don't need the Moorestown PCI support either. Signed-off-by: Yinghai Lu <yinghai@kernel.org> LKML-Reference: <4B858E89.7040807@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/pci/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 4753ebc19cae..56caf2a18baa 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -13,7 +13,9 @@ obj-$(CONFIG_X86_VISWS) += visws.o
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
-obj-y += common.o early.o mrst.o
+obj-$(CONFIG_X86_MRST) += mrst.o
+
+obj-y += common.o early.o
obj-y += amd_bus.o
obj-$(CONFIG_X86_64) += bus_numa.o