aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-01-12 08:01:40 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 17:24:40 -0800
commit72ce943013baaba4af7afec76c3556b16b9f6de4 (patch)
treec372c65ba8efbc72b870c4d7639814a68dc57d47 /arch/x86/pci
parent45e7e24360e799f7753f37ca5642a0d6e29b9c62 (diff)
downloadkernel_samsung_espresso10-72ce943013baaba4af7afec76c3556b16b9f6de4.zip
kernel_samsung_espresso10-72ce943013baaba4af7afec76c3556b16b9f6de4.tar.gz
kernel_samsung_espresso10-72ce943013baaba4af7afec76c3556b16b9f6de4.tar.bz2
x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y
commit 5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274 upstream. 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> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/pci')
-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 6b8759f..d24d3da 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_MRST) += 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)