Messages in this thread Patch in this message | | | From | "Matthew Bell" <> | Date | Thu, 08 Aug 2002 07:47:44 +0800 | Subject | [PATCH] 2.4.19; 3c515.c <should work with isapnp.o> |
| |
The isapnp code in 3c515.c should work with isapnp.c as a module(?), so I have changed the '#ifdef CONFIG_ISAPNP's to '#if defined(CONFIG_ISAPNP) || ((MODULE) && (CONFIG_ISAPNP_MODULE))'. --3c515.diff---------------------------------------------- --- linux-2.4.19.orig/drivers/net/3c515.c 2002-02-25 19:37:59.000000000 +0000 +++ linux-2.4.19/drivers/net/3c515.c 2002-08-03 18:24:05.000000000 +0100 @@ -370,7 +370,7 @@ { "Default", 0, 0xFF, XCVR_10baseT, 10000}, };
-#ifdef CONFIG_ISAPNP +#if defined(CONFIG_ISAPNP) || (defined (MODULE) && defined (CONFIG_ISAPNP_MODULE)) static struct isapnp_device_id corkscrew_isapnp_adapters[] = { { ISAPNP_ANY_ID, ISAPNP_ANY_ID, ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5051), @@ -462,12 +462,12 @@ { int cards_found = 0; static int ioaddr; -#ifdef CONFIG_ISAPNP +#if defined(CONFIG_ISAPNP) || (defined (MODULE) && defined (CONFIG_ISAPNP_MODULE)) short i; static int pnp_cards; #endif
-#ifdef CONFIG_ISAPNP +#if defined(CONFIG_ISAPNP) || (defined (MODULE) && defined (CONFIG_ISAPNP_MODULE)) if(nopnp == 1) goto no_pnp; for(i=0; corkscrew_isapnp_adapters[i].vendor != 0; i++) { @@ -530,7 +530,7 @@ /* Check all locations on the ISA bus -- evil! */ for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x20) { int irq; -#ifdef CONFIG_ISAPNP +#if defined(CONFIG_ISAPNP) || (defined (MODULE) && defined (CONFIG_ISAPNP_MODULE)) /* Make sure this was not already picked up by isapnp */ if(ioaddr == corkscrew_isapnp_phys_addr[0]) continue; if(ioaddr == corkscrew_isapnp_phys_addr[1]) continue; --3c515.diff---------------------------------------------- -- _______________________________________________ Download the free Opera browser at http://www.opera.com/ Free OperaMail at http://www.operamail.com/
Powered by Outblaze - 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/
| |