2 files changed, 32 insertions, 27 deletions

diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
index 77b1b9abedc2..d04d8f976d1c 100644
--- a/arch/x86_64/pci/Makefile
+++ b/arch/x86_64/pci/Makefile
@@ -1,27 +1,5 @@
-#
-# Makefile for X86_64 specific PCI routines
-#
-# Reuse the i386 PCI subsystem
-#
-EXTRA_CFLAGS += -Iarch/i386/pci
-
-obj-y           := i386.o
-obj-$(CONFIG_PCI_DIRECT)+= direct.o
-obj-y           += fixup.o init.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-$(CONFIG_NUMA)      += k8-bus_64.o
-
-direct-y += ../../i386/pci/direct.o
-acpi-y   += ../../i386/pci/acpi.o
-legacy-y += ../../i386/pci/legacy.o
-irq-y    += ../../i386/pci/irq.o
-common-y += ../../i386/pci/common.o
-fixup-y  += ../../i386/pci/fixup.o
-i386-y  += ../../i386/pci/i386.o
-init-y += ../../i386/pci/init.o
-early-y += ../../i386/pci/early.o
-mmconfig-shared-y += ../../i386/pci/mmconfig-shared.o
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/i386/pci/Makefile_32
+else
+include ${srctree}/arch/x86_64/pci/Makefile_64
+endif
diff --git a/arch/x86_64/pci/Makefile_64 b/arch/x86_64/pci/Makefile_64
new file mode 100644
index 000000000000..77b1b9abedc2
--- /dev/null
+++ b/arch/x86_64/pci/Makefile_64
@@ -0,0 +1,27 @@
+#
+# Makefile for X86_64 specific PCI routines
+#
+# Reuse the i386 PCI subsystem
+#
+EXTRA_CFLAGS += -Iarch/i386/pci
+
+obj-y           := i386.o
+obj-$(CONFIG_PCI_DIRECT)+= direct.o
+obj-y           += fixup.o init.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-$(CONFIG_NUMA)      += k8-bus_64.o
+
+direct-y += ../../i386/pci/direct.o
+acpi-y   += ../../i386/pci/acpi.o
+legacy-y += ../../i386/pci/legacy.o
+irq-y    += ../../i386/pci/irq.o
+common-y += ../../i386/pci/common.o
+fixup-y  += ../../i386/pci/fixup.o
+i386-y  += ../../i386/pci/i386.o
+init-y += ../../i386/pci/init.o
+early-y += ../../i386/pci/early.o
+mmconfig-shared-y += ../../i386/pci/mmconfig-shared.o