Commit a1fd9e95 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] PCI: unconfuse arch/i386/pci/Makefile

I was looking in this Makefile for link order when my head began to hurt.
Apparently you can't have both NUMAQ and VISWS selected, so getting rid
of all the ifdefs/ifndefs like this should work.
parent f8a30ee9
......@@ -3,25 +3,11 @@ obj-y := i386.o
obj-$(CONFIG_PCI_BIOS) += pcbios.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
obj-$(CONFIG_X86_VISWS) += visws.o
pci-y := fixup.o
pci-$(CONFIG_ACPI_PCI) += acpi.o
pci-y += legacy.o irq.o
ifdef CONFIG_X86_NUMAQ
obj-y += numa.o
else
obj-y += fixup.o
pci-$(CONFIG_X86_VISWS) := visws.o fixup.o
pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o
ifdef CONFIG_ACPI_PCI
obj-y += acpi.o
endif
ifndef CONFIG_X86_VISWS
obj-y += legacy.o
endif
endif # CONFIG_X86_NUMAQ
ifndef CONFIG_X86_VISWS
obj-y += irq.o
endif
obj-y += common.o
obj-y += $(pci-y) common.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment