Merge branch 'linus' into x86/pebs

[linux-2.6-omap-h63xx.git] / arch / x86 / pci / Makefile

diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index c5c8e485fc446fffc3fdde5e1d8e6d63306c999f..d49202e740eaf5a224897e4991c9eec951657918 100644 (file)
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -1,5 +1,17 @@
-ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/pci/Makefile_32
-else
-include ${srctree}/arch/x86/pci/Makefile_64
-endif
+obj-y                          := i386.o init.o
+
+obj-$(CONFIG_PCI_BIOS)         += pcbios.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
+
+obj-y                          += fixup.o
+obj-$(CONFIG_ACPI)             += acpi.o
+obj-y                          += legacy.o irq.o
+
+obj-$(CONFIG_X86_VISWS)                += visws.o
+
+obj-$(CONFIG_X86_NUMAQ)                += numaq_32.o
+
+obj-y                          += common.o early.o
+obj-y                          += amd_bus.o