From 5d625d6449e95b6fad08258b25c99296b235c2a7 Mon Sep 17 00:00:00 2001 From: Robert Richter Date: Wed, 2 Jul 2008 22:50:27 +0200 Subject: [PATCH] --- yaml --- r: 100107 b: refs/heads/master c: f4d994b541198446fc3d5d4ec5de232e171bf6dd h: refs/heads/master i: 100105: 31f8d07df6751f665594627a62d250d8e1d55bd8 100103: f051e78450e5c895358b4d265773e4fd75134897 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/Makefile | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 23f753cd60d8..98871766f2fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d199a0482791bdf2f052081aa212d8c83ccef88a +refs/heads/master: f4d994b541198446fc3d5d4ec5de232e171bf6dd diff --git a/trunk/arch/x86/pci/Makefile b/trunk/arch/x86/pci/Makefile index f3643a7be85b..1ba1236094a4 100644 --- a/trunk/arch/x86/pci/Makefile +++ b/trunk/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