[PATCH 05/11] x86/pci: Makefile merge: Changing 64bit ordering

[Robert Richter]

This should be save 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@xxxxxxx>
---
 arch/x86/pci/Makefile |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index d69a0fe..0fc3425 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -30,14 +30,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
-- 
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/