Commit 5cf9a4e6 authored Jan 12, 2012 by Bjorn Helgaas Committed by Linus Torvalds Jan 12, 2012

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>

parent 4c4d285a

arch/x86/pci/Makefile

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,9 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
	obj-$(CONFIG_X86_INTEL_MID) += mrst.o		obj-$(CONFIG_X86_INTEL_MID) += mrst.o

	obj-y += common.o early.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		obj-$(CONFIG_PCI_CNB20LE_QUIRK) += broadcom_bus.o

	ifeq ($(CONFIG_PCI_DEBUG),y)		ifeq ($(CONFIG_PCI_DEBUG),y)

Admin message