From: Robert Richter Date: Wed, 2 Jul 2008 20:50:22 +0000 (+0200) Subject: x86/pci: Makefile merge: decoupling options for mp_bus_to_node.o X-Git-Tag: v2.6.27-rc1~1106^2~32^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a5d4fb94f750e439a0722c0a76c9aade3a9199be;p=linux-2.6-omap-h63xx.git x86/pci: Makefile merge: decoupling options for mp_bus_to_node.o Signed-off-by: Robert Richter Acked-by: Jesse Barnes Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index 30944bc5252..044fa5bb2ff 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile @@ -14,6 +14,7 @@ pci-y := fixup.o # legacy/irq.o pci-$(CONFIG_ACPI) += acpi.o pci-y += legacy.o irq.o +pci-$(CONFIG_NUMA) += mp_bus_to_node.o # Careful: VISWS overrule the pci-y above. The colons are # therefor correct. This needs a proper fix by distangling the code. @@ -21,9 +22,6 @@ pci-$(CONFIG_X86_VISWS) := visws.o fixup.o pci-$(CONFIG_X86_NUMAQ) += numa.o -# Necessary for NUMAQ as well -pci-$(CONFIG_NUMA) += mp_bus_to_node.o - obj-y += $(pci-y) common.o early.o obj-y += amd_bus.o