From: Robert Richter Date: Wed, 2 Jul 2008 20:50:23 +0000 (+0200) Subject: x86/pci: Makefile merge: changing 64bit ordering X-Git-Tag: upstream/snapshot3+hdmi~24385^2~34^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8043c7be4b8dabaaeed8344dd0a4cbaa9a94fb71;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Acked-by: Jesse Barnes Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index 044fa5b..d5f15ef 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