aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-07-02 22:50:27 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-09 11:44:45 +0200
commitf4d994b541198446fc3d5d4ec5de232e171bf6dd (patch)
tree799c21618def838f45edc456add2d6f160bd0ede
parentd199a0482791bdf2f052081aa212d8c83ccef88a (diff)
x86/pci: Makefile merge: coalescing 32 and 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>
-rw-r--r--arch/x86/pci/Makefile21
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index f3643a7be85..1ba1236094a 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -1,9 +1,7 @@
-ifeq ($(CONFIG_X86_32),y)
-
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_MMCONFIG) += mmconfig_$(BITS).o direct.o mmconfig-shared.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
obj-$(CONFIG_PCI_OLPC) += olpc.o
@@ -23,20 +21,3 @@ pci-$(CONFIG_X86_NUMAQ) += numa.o
obj-y += $(pci-y) common.o early.o
obj-y += amd_bus.o
-
-else
-
-#
-# Makefile for X86_64 specific PCI routines
-#
-
-obj-y := i386.o init.o
-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.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
-obj-y += $(pci-y) common.o early.o
-obj-y += amd_bus.o
-
-endif