x86/pci: Makefile merge: changing 64bit ordering

This should be safe since mmconfig*.o and init.o do not contain
*initcalls with the same level as in other files.

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 044fa5b..d5f15ef 100644 (file)
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -31,14 +31,13 @@ else
 # Makefile for X86_64 specific PCI routines
 #
 
-obj-y                          := i386.o
+obj-y                          := i386.o init.o
+obj-$(CONFIG_PCI_MMCONFIG)     += mmconfig_64.o direct.o mmconfig-shared.o
 obj-$(CONFIG_PCI_DIRECT)       += direct.o
-obj-y                          += fixup.o init.o
+obj-y                          += fixup.o
 obj-$(CONFIG_ACPI)             += acpi.o
-obj-y                          += legacy.o irq.o common.o early.o
-# mmconfig has a 64bit special
-obj-$(CONFIG_PCI_MMCONFIG)     += mmconfig_64.o direct.o mmconfig-shared.o
-
+obj-y                          += legacy.o irq.o
+obj-y                          += common.o early.o
 obj-y                          += amd_bus.o
 
 endif