summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-01-12 08:01:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-12 07:54:18 -0800
commit5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274 (patch)
tree0cf79dc1738efa6625efb23740732778731a3505
parent4c4d285ad5665bfbd983b95fde8d7a477d24a361 (diff)
downloadop-kernel-dev-5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274.zip
op-kernel-dev-5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274.tar.gz
x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y
We only need amd_bus.o for AMD systems with PCI. arch/x86/pci/Makefile already depends on CONFIG_PCI=y, so this patch just adds the dependency on CONFIG_AMD_NB. Cc: Yinghai Lu <yinghai@kernel.org> Cc: stable@kernel.org # 2.6.34+ (needs adjustment for k8 -> amd rename) Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/pci/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 75b06f3..e76e18c 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -18,8 +18,9 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-$(CONFIG_X86_INTEL_MID) += mrst.o
obj-y += common.o early.o
-obj-y += amd_bus.o bus_numa.o
+obj-y += bus_numa.o
+obj-$(CONFIG_AMD_NB) += amd_bus.o
obj-$(CONFIG_PCI_CNB20LE_QUIRK) += broadcom_bus.o
ifeq ($(CONFIG_PCI_DEBUG),y)
OpenPOWER on IntegriCloud