x86/pci: Makefile merge: decoupling options for mp_bus_to_node.o

Signed-off-by: Robert Richter <robert.richter@amd.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 30944bc..044fa5b 100644 (file)
--- 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
 # 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.
 
 # 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
 
 
 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
 
 obj-y                          += $(pci-y) common.o early.o
 obj-y                          += amd_bus.o