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 1ba1236094a4dabd8580695fdee6fce2f2f2ec99..d49202e740eaf5a224897e4991c9eec951657918 100644 (file)
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -5,19 +5,13 @@ obj-$(CONFIG_PCI_MMCONFIG)    += mmconfig_$(BITS).o direct.o mmconfig-shared.o
 obj-$(CONFIG_PCI_DIRECT)       += direct.o
 obj-$(CONFIG_PCI_OLPC)         += olpc.o
 
-pci-y                          := fixup.o
+obj-y                          += fixup.o
+obj-$(CONFIG_ACPI)             += acpi.o
+obj-y                          += legacy.o irq.o
 
-# Do not change the ordering here. There is a nasty init function
-# ordering dependency which breaks when you move acpi.o below
-# legacy/irq.o
-pci-$(CONFIG_ACPI)             += acpi.o
-pci-y                          += legacy.o irq.o
+obj-$(CONFIG_X86_VISWS)                += visws.o
 
-# Careful: VISWS overrule the pci-y above. The colons are
-# therefor correct. This needs a proper fix by distangling the code.
-pci-$(CONFIG_X86_VISWS)                := visws.o fixup.o
+obj-$(CONFIG_X86_NUMAQ)                += numaq_32.o
 
-pci-$(CONFIG_X86_NUMAQ)                += numa.o
-
-obj-y                          += $(pci-y) common.o early.o
+obj-y                          += common.o early.o
 obj-y                          += amd_bus.o