[2.6 patch] fix arch/i386/pci/Makefile

[Adrian Bunk]

I got the following compile error in 2.6.7-mm2 (but it doesn't seem to 
be specific to -mm2):

<--  snip  -->

...
  LD      .tmp_vmlinux1
drivers/built-in.o(.text+0x6c24a): In function `acpi_pci_root_add':
: undefined reference to `pci_acpi_scan_root'
make: *** [.tmp_vmlinux1] Error 1

<--  snip  -->

This problem occurs with
  CONFIG_ACPI_PCI=y && (CONFIG_X86_VISWS=y || CONFIG_X86_NUMAQ=y)

The patch below fixes it.

Please apply
Adrian


--- linux-2.6.7-mm2-full/arch/i386/pci/Makefile.old	2004-06-25 02:08:29.000000000 +0200
+++ linux-2.6.7-mm2-full/arch/i386/pci/Makefile	2004-06-25 02:10:36.000000000 +0200
@@ -5,10 +5,11 @@
 obj-$(CONFIG_PCI_DIRECT)	+= direct.o
 
 pci-y				:= fixup.o
-pci-$(CONFIG_ACPI_PCI)		+= acpi.o
 pci-y				+= legacy.o irq.o
 
 pci-$(CONFIG_X86_VISWS)		:= visws.o fixup.o
 pci-$(CONFIG_X86_NUMAQ)		:= numa.o irq.o
 
+pci-$(CONFIG_ACPI_PCI)		+= acpi.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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/