Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8043c7be authored by Robert Richter's avatar Robert Richter Committed by Ingo Molnar
Browse files

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: default avatarRobert Richter <robert.richter@amd.com>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a5d4fb94

arch/x86/pci/Makefile

+5 −6
Original line number Diff line number Diff line
@@ -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