From 7bb939796cb87571ee2af5d84bf25ddb2ec73000 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Thu, 12 Jan 2012 08:01:40 -0700 Subject: [PATCH] --- yaml --- r: 283655 b: refs/heads/master c: 5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274 h: refs/heads/master i: 283653: 6be15a7bf6d8b7d0c95d700e6a3369569cb75f05 283651: d54efe96c764179e3167d0fcfa286f05de14b9c1 283647: 0f6bd03ff7bf17559d83c7e77465fddab0e3fb05 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 62f55f8e7bdd..d62d39545cc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c4d285ad5665bfbd983b95fde8d7a477d24a361 +refs/heads/master: 5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274 diff --git a/trunk/arch/x86/pci/Makefile b/trunk/arch/x86/pci/Makefile index 75b06f34b1f2..e76e18c94a3c 100644 --- a/trunk/arch/x86/pci/Makefile +++ b/trunk/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)