patch-2.3.51 linux/drivers/net/3c509.c
Next file: linux/drivers/net/aironet4500.h
Previous file: linux/drivers/char/raw.c
Back to the patch index
Back to the overall index
- Lines: 24
- Date:
Thu Mar 9 17:39:10 2000
- Orig file:
v2.3.50/linux/drivers/net/3c509.c
- Orig date:
Sat Feb 12 11:22:10 2000
diff -u --recursive --new-file v2.3.50/linux/drivers/net/3c509.c linux/drivers/net/3c509.c
@@ -186,8 +186,10 @@
{0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0},
{0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}
};
-#endif
+#endif /* CONFIG_ISAPNP */
+#if defined(CONFIG_ISAPNP) || defined(MODULE)
static int nopnp = 0;
+#endif
int el3_probe(struct net_device *dev)
{
@@ -195,8 +197,10 @@
int ioaddr, irq, if_port;
u16 phys_addr[3];
static int current_tag = 0;
- static int pnp_cards = 0;
int mca_slot = -1;
+#ifdef CONFIG_ISAPNP
+ static int pnp_cards = 0;
+#endif
/* First check all slots of the EISA bus. The next slot address to
probe is kept in 'eisa_addr' to support multiple probe() calls. */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)