x86/pci: Makefile merge: creating pci-y for 64 bit

Signed-off-by: Robert Richter <robert.richter@amd.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index d5f15eff2be0b50bae25ab6ee24909bdc25add4a..ed130a2ef6712cc6af628fac2363a8deb62fdf25 100644 (file)
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -34,10 +34,10 @@ else
 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
-obj-$(CONFIG_ACPI)             += acpi.o
-obj-y                          += legacy.o irq.o
-obj-y                          += common.o early.o
+pci-y                          := fixup.o
+pci-$(CONFIG_ACPI)             += acpi.o
+pci-y                          += legacy.o irq.o
+obj-y                          += $(pci-y) common.o early.o
 obj-y                          += amd_bus.o
 
 endif