[PATCH 2/5] x86/pci: Makefile merge: Changing 32bit ordering

[Robert Richter]

This should be save since VISWS and NUMAQ exclud each other.

Signed-off-by: Robert Richter <robert.richter@xxxxxxx>
---
 arch/x86/pci/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 99d9f09..2a08d2d 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -8,12 +8,11 @@ obj-$(CONFIG_PCI_OLPC)		+= olpc.o
 pci-y				:= fixup.o
 pci-$(CONFIG_ACPI)		+= acpi.o
 pci-y				+= legacy.o irq.o
+pci-$(CONFIG_X86_NUMAQ)		+= numa.o
 
 # Careful: VISWS overrule the pci-y above. The colons are
 # therefor correct. This needs a proper fix by distangling the code.
 pci-$(CONFIG_X86_VISWS)		:= visws.o fixup.o
 
-pci-$(CONFIG_X86_NUMAQ)		+= numa.o
-
 obj-y				+= $(pci-y) common.o early.o
 obj-y				+= amd_bus.o
-- 
1.5.5.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/