patch-2.3.99-pre6 linux/drivers/net/3c515.c

• Lines: 41
• Date: Tue Apr 25 16:53:13 2000
• Orig file: v2.3.99-pre5/linux/drivers/net/3c515.c
• Orig date: Mon Mar 27 08:08:25 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/net/3c515.c linux/drivers/net/3c515.c
@@ -46,7 +46,6 @@
 #define RX_RING_SIZE	16
 #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer. */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/isapnp.h>
@@ -353,7 +352,7 @@
 	{ "Default", 0, 0xFF, XCVR_10baseT, 10000},
 };
 
-#ifdef CONFIG_ISAPNP
+#ifdef __ISAPNP__
 struct corkscrew_isapnp_adapters_struct {
 	unsigned short vendor, function;
 	char *name;
@@ -445,7 +444,7 @@
 	static int ioaddr;
 	static int pnp_cards = 0;
 
-#ifdef CONFIG_ISAPNP
+#ifdef __ISAPNP__
 	if(nopnp == 1)
 		goto no_pnp;
 	for(i=0; corkscrew_isapnp_adapters[i].vendor != 0; i++) {
@@ -503,12 +502,12 @@
 		}
 	}
 no_pnp:
-#endif /* not CONFIG_ISAPNP */
+#endif /* not __ISAPNP__ */
 
 	/* Check all locations on the ISA bus -- evil! */
 	for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x20) {
 		int irq;
-#ifdef CONFIG_ISAPNP
+#ifdef __ISAPNP__
 		/* 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;