diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 18:47:29 +0200 |
commit | f87f38ec5a5157aa39f44f6018dc58ea62f8e0e2 (patch) | |
tree | 1612249d11d455cfd6a0d691f5564673ae179c5f /arch/x86/pci/Makefile_32 | |
parent | a6784ad7eafa74a085c8458909eda0699a8fcf57 (diff) | |
parent | 8dd779b19ce5972072ad2372a86c8acbae4da768 (diff) |
Merge branch 'x86/unify-pci' into x86/core
Diffstat (limited to 'arch/x86/pci/Makefile_32')
-rw-r--r-- | arch/x86/pci/Makefile_32 | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32 deleted file mode 100644 index a34fbf55792..00000000000 --- a/arch/x86/pci/Makefile_32 +++ /dev/null @@ -1,26 +0,0 @@ -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 -obj-$(CONFIG_PCI_OLPC) += olpc.o - -pci-y := fixup.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 - -# 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 - -pci-$(CONFIG_X86_NUMAQ) += numa.o - -# Necessary for NUMAQ as well -pci-$(CONFIG_NUMA) += mp_bus_to_node.o - -obj-y += $(pci-y) common.o early.o -obj-y += amd_bus.o |