From e08655b99e1c54ebde761ee03d3605b8243ff07a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:13:37 +0200 Subject: [PATCH] --- yaml --- r: 65426 b: refs/heads/master c: 5fa25bee6cee459ee3d08f7544cca5a9fb016c8b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/pci/Makefile | 19 +++++-------------- trunk/arch/i386/pci/Makefile_32 | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 trunk/arch/i386/pci/Makefile_32 diff --git a/[refs] b/[refs] index f1ac45af18eb..284b7b77a3a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e32c44c8349dbdf7712a7d868fdbff75599c9005 +refs/heads/master: 5fa25bee6cee459ee3d08f7544cca5a9fb016c8b diff --git a/trunk/arch/i386/pci/Makefile b/trunk/arch/i386/pci/Makefile index cdd6828b5abb..d04d8f976d1c 100644 --- a/trunk/arch/i386/pci/Makefile +++ b/trunk/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/trunk/arch/i386/pci/Makefile_32 b/trunk/arch/i386/pci/Makefile_32 new file mode 100644 index 000000000000..cdd6828b5abb --- /dev/null +++ b/trunk/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