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

Signed-off-by: NRobert Richter <robert.richter@amd.com>
Acked-by: NJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: NIngo Molnar <mingo@elte.hu>

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