36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 722a639fd2cec44501c04ae32af57fd822c5a2d5 Mon Sep 17 00:00:00 2001
|
|
From: Yinghai Lu <yinghai@kernel.org>
|
|
Date: Wed, 24 Feb 2010 12:39:37 -0800
|
|
Subject: [PATCH] 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>
|
|
Acked-by: Yong Wang <yong.y.wang@intel.com>
|
|
Patch-mainline: Patch-mainline: Merged into x86/mrst branch of -tip
|
|
---
|
|
arch/x86/pci/Makefile | 4 +++-
|
|
1 files changed, 3 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
|
|
index 4753ebc..56caf2a 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
|
|
|
|
--
|
|
1.5.5.1
|
|
|