ChangeSet 1.1348.14.3, 2003/06/23 14:44:35-07:00, willy@debian.org
[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.
arch/i386/pci/Makefile | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff -Nru a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
--- a/arch/i386/pci/Makefile Mon Jun 23 16:53:57 2003
+++ b/arch/i386/pci/Makefile Mon Jun 23 16:53:57 2003
@@ -1,27 +1,13 @@
-obj-y := i386.o
+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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jun 23 2003 - 22:00:42 EST