summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-07-02 22:50:23 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-09 11:44:22 +0200
commit8043c7be4b8dabaaeed8344dd0a4cbaa9a94fb71 (patch)
tree2452a86af40137937e55adb71c2ca2745925d1e5 /arch/x86
parenta5d4fb94f750e439a0722c0a76c9aade3a9199be (diff)
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/pci/Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 044fa5bb2ff6..d5f15eff2be0 100644
--- 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