From 6d8566ac131f3dc3e976de824dcb04feaea4b14c Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Wed, 2 Jul 2008 22:50:19 +0200 Subject: [PATCH] x86/pci: Makefile merge: Removing Makefile_* No functional nor ordering changes here. Signed-off-by: Robert Richter Acked-by: Jesse Barnes Signed-off-by: Ingo Molnar --- arch/x86/pci/{Makefile_32 => Makefile} | 23 +++++++++++++++++++++++ arch/x86/pci/Makefile_64 | 17 ----------------- 2 files changed, 23 insertions(+), 17 deletions(-) rename arch/x86/pci/{Makefile_32 => Makefile} (64%) delete mode 100644 arch/x86/pci/Makefile_64 diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile similarity index 64% rename from arch/x86/pci/Makefile_32 rename to arch/x86/pci/Makefile index a34fbf55792..3a8fb7303ad 100644 --- a/arch/x86/pci/Makefile_32 +++ b/arch/x86/pci/Makefile @@ -1,3 +1,5 @@ +ifeq ($(CONFIG_X86_32),y) + obj-y := i386.o init.o obj-$(CONFIG_PCI_BIOS) += pcbios.o @@ -24,3 +26,24 @@ pci-$(CONFIG_NUMA) += mp_bus_to_node.o obj-y += $(pci-y) common.o early.o obj-y += amd_bus.o + +else + +# +# Makefile for X86_64 specific PCI routines +# +# Reuse the i386 PCI subsystem +# +EXTRA_CFLAGS += -Iarch/x86/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-y += amd_bus.o + +endif diff --git a/arch/x86/pci/Makefile_64 b/arch/x86/pci/Makefile_64 deleted file mode 100644 index fd47068c95d..00000000000 --- a/arch/x86/pci/Makefile_64 +++ /dev/null @@ -1,17 +0,0 @@ -# -# Makefile for X86_64 specific PCI routines -# -# Reuse the i386 PCI subsystem -# -EXTRA_CFLAGS += -Iarch/x86/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-y += amd_bus.o - -- 2.11.4.GIT