1 From 722a639fd2cec44501c04ae32af57fd822c5a2d5 Mon Sep 17 00:00:00 2001
\r
2 From: Yinghai Lu <yinghai@kernel.org>
\r
3 Date: Wed, 24 Feb 2010 12:39:37 -0800
\r
4 Subject: [PATCH] x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n
\r
6 If we don't have any Moorestown CPU support compiled in, we don't need
\r
7 the Moorestown PCI support either.
\r
9 Signed-off-by: Yinghai Lu <yinghai@kernel.org>
\r
10 LKML-Reference: <4B858E89.7040807@kernel.org>
\r
11 Signed-off-by: H. Peter Anvin <hpa@zytor.com>
\r
12 Acked-by: Yong Wang <yong.y.wang@intel.com>
\r
13 Patch-mainline: Patch-mainline: Merged into x86/mrst branch of -tip
\r
15 arch/x86/pci/Makefile | 4 +++-
\r
16 1 files changed, 3 insertions(+), 1 deletions(-)
\r
18 diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
\r
19 index 4753ebc..56caf2a 100644
\r
20 --- a/arch/x86/pci/Makefile
\r
21 +++ b/arch/x86/pci/Makefile
\r
22 @@ -13,7 +13,9 @@ obj-$(CONFIG_X86_VISWS) += visws.o
\r
24 obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
\r
26 -obj-y += common.o early.o mrst.o
\r
27 +obj-$(CONFIG_X86_MRST) += mrst.o
\r
29 +obj-y += common.o early.o
\r
31 obj-$(CONFIG_X86_64) += bus_numa.o
\r