Commit 5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274

Authored by Bjorn Helgaas
Committed by Linus Torvalds
1 parent 4c4d285ad5

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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

arch/x86/pci/Makefile
... ... @@ -18,8 +18,9 @@
18 18 obj-$(CONFIG_X86_INTEL_MID) += mrst.o
19 19  
20 20 obj-y += common.o early.o
21   -obj-y += amd_bus.o bus_numa.o
  21 +obj-y += bus_numa.o
22 22  
  23 +obj-$(CONFIG_AMD_NB) += amd_bus.o
23 24 obj-$(CONFIG_PCI_CNB20LE_QUIRK) += broadcom_bus.o
24 25  
25 26 ifeq ($(CONFIG_PCI_DEBUG),y)