Skip to content

Commit

Permalink
x86/PCI: build amd_bus.o only when CONFIG_AMD_NB=y
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bjorn Helgaas authored and Linus Torvalds committed Jan 12, 2012
1 parent 4c4d285 commit 5cf9a4e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/pci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5cf9a4e

Please sign in to comment.