Messages in this thread Patch in this message | | | From | Robert Richter <> | Subject | [PATCH 09/11] x86/pci: Makefile merge: Coalescing 32 and 64 bit | Date | Wed, 2 Jul 2008 22:50:27 +0200 |
| |
Signed-off-by: Robert Richter <robert.richter@amd.com> --- arch/x86/pci/Makefile | 21 +-------------------- 1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index 58a3749..c92dc6f 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 @@ -22,20 +20,3 @@ pci-$(CONFIG_X86_NUMAQ) := numa.o irq.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 -- 1.5.5.4
| |