diff options
author | Robert Richter <robert.richter@amd.com> | 2008-07-02 16:50:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 05:44:22 -0400 |
commit | 8043c7be4b8dabaaeed8344dd0a4cbaa9a94fb71 (patch) | |
tree | 2452a86af40137937e55adb71c2ca2745925d1e5 /arch | |
parent | a5d4fb94f750e439a0722c0a76c9aade3a9199be (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')
-rw-r--r-- | 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 044fa5bb2ff6..d5f15eff2be0 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile | |||
@@ -31,14 +31,13 @@ else | |||
31 | # Makefile for X86_64 specific PCI routines | 31 | # Makefile for X86_64 specific PCI routines |
32 | # | 32 | # |
33 | 33 | ||
34 | obj-y := i386.o | 34 | obj-y := i386.o init.o |
35 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o | ||
35 | obj-$(CONFIG_PCI_DIRECT) += direct.o | 36 | obj-$(CONFIG_PCI_DIRECT) += direct.o |
36 | obj-y += fixup.o init.o | 37 | obj-y += fixup.o |
37 | obj-$(CONFIG_ACPI) += acpi.o | 38 | obj-$(CONFIG_ACPI) += acpi.o |
38 | obj-y += legacy.o irq.o common.o early.o | 39 | obj-y += legacy.o irq.o |
39 | # mmconfig has a 64bit special | 40 | obj-y += common.o early.o |
40 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o | ||
41 | |||
42 | obj-y += amd_bus.o | 41 | obj-y += amd_bus.o |
43 | 42 | ||
44 | endif | 43 | endif |