2 files changed, 19 insertions, 14 deletions

diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
index cdd6828b5abb..d04d8f976d1c 100644
--- a/arch/i386/pci/Makefile
+++ b/arch/i386/pci/Makefile
@@ -1,14 +1,5 @@
-obj-y                           := i386.o init.o
-
-obj-$(CONFIG_PCI_BIOS)          += pcbios.o
-obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig_32.o direct.o mmconfig-shared.o
-obj-$(CONFIG_PCI_DIRECT)        += direct.o
-
-pci-y                           := fixup.o
-pci-$(CONFIG_ACPI)              += acpi.o
-pci-y                           += legacy.o irq.o
-
-pci-$(CONFIG_X86_VISWS)         := visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ)         := numa.o irq.o
-
-obj-y                           += $(pci-y) common.o early.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/i386/pci/Makefile_32 b/arch/i386/pci/Makefile_32
new file mode 100644
index 000000000000..cdd6828b5abb
--- /dev/null
+++ b/arch/i386/pci/Makefile_32
@@ -0,0 +1,14 @@
+obj-y                           := i386.o init.o
+
+obj-$(CONFIG_PCI_BIOS)          += pcbios.o
+obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig_32.o direct.o mmconfig-shared.o
+obj-$(CONFIG_PCI_DIRECT)        += direct.o
+
+pci-y                           := fixup.o
+pci-$(CONFIG_ACPI)              += acpi.o
+pci-y                           += legacy.o irq.o
+
+pci-$(CONFIG_X86_VISWS)         := visws.o fixup.o
+pci-$(CONFIG_X86_NUMAQ)         := numa.o irq.o
+
+obj-y                           += $(pci-y) common.o early.o