On Wed, Jan 25, 2012 at 2:08 PM, Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> wrote: > On Mon, 09 Jan 2012 15:43:49 -0700 > Bjorn Helgaas <bhelgaas@xxxxxxxxxx> wrote: > >> 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@xxxxxxxxxx> >> Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> >> --- >> arch/x86/pci/Makefile | 3 ++- >> 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) > > Arg sorry guys I've been totally swamped since sending in the pull > req. I'll do a review & merge pass on the outstanding stuff tomorrow. Linus picked up this particular fix already (5cf9a4e69c1ff), so don't worry about this one. Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
