[PATCH] Obvious: CONFIG_ISAPNP #ifdefs wrong in drivers/net/3c515.c

From: Matthew Bell (m.bell@bvrh.co.uk)
Date: Fri Jun 20 2003 - 08:32:38 EST

ISAPNP should also work if it is built as a module. Here is a patch that works
for me:
--- 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;
-
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:32 EST