Alan Cox wrote:
>
> > /me begins to download and merge ac12...
>
> It built for me too
Found it -- 3c509 bug of a different sort. You don't notice if
CONFIG_ISAPNP is a module... only if its built into the kernel. That
code is not conditional on CONFIG_ISAPNP_MODULE, only CONFIG_ISAPNP.
Attached are the compilation fixes -- should apply to 2.4.3-pre2 or
2.4.2-ac12 ok.
The patch does not address the larger issue of CONFIG_ISAPNP versus
CONFIG_ISAPNP_MODULE... That will have to be visited for several
drivers I think, and its not a 2-second obvious fix like the attached
patch (which needs to be applied anyway).
-- Jeff Garzik | "You see, in this world there's two kinds of Building 1024 | people, my friend: Those with loaded guns MandrakeSoft | and those who dig. You dig." --Blondie
Index: drivers/net/3c509.c =================================================================== RCS file: /cvsroot/gkernel/linux_2_4/drivers/net/3c509.c,v retrieving revision 1.1.1.22.2.1 diff -u -r1.1.1.22.2.1 3c509.c --- drivers/net/3c509.c 2001/03/05 00:39:14 1.1.1.22.2.1 +++ drivers/net/3c509.c 2001/03/06 03:05:53 @@ -327,7 +327,7 @@ irq = idev->irq_resource[0].start; if (el3_debug > 3) printk ("ISAPnP reports %s at i/o 0x%x, irq %d\n", - el3_isapnp_adapters[i].name, ioaddr, irq); + (char*) el3_isapnp_adapters[i].driver_data, ioaddr, irq); EL3WINDOW(0); for (j = 0; j < 3; j++) el3_isapnp_phys_addr[pnp_cards][j] = Index: drivers/net/3c515.c =================================================================== RCS file: /cvsroot/gkernel/linux_2_4/drivers/net/3c515.c,v retrieving revision 1.1.1.22.2.1 diff -u -r1.1.1.22.2.1 3c515.c --- drivers/net/3c515.c 2001/03/05 00:39:14 1.1.1.22.2.1 +++ drivers/net/3c515.c 2001/03/06 03:05:54 @@ -474,7 +474,7 @@ irq = idev->irq_resource[0].start; if(corkscrew_debug) printk ("ISAPNP reports %s at i/o 0x%x, irq %d\n", - corkscrew_isapnp_adapters[i].name,ioaddr, irq); + (char*) corkscrew_isapnp_adapters[i].driver_data, ioaddr, irq); if ((inw(ioaddr + 0x2002) & 0x1f0) != (ioaddr & 0x1f0)) continue;
- 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 : Wed Mar 07 2001 - 21:00:18 EST