patch-2.4.0-test10 linux/drivers/net/sunlance.c

• Lines: 65
• Date: Mon Oct 23 21:59:03 2000
• Orig file: v2.4.0-test9/linux/drivers/net/sunlance.c
• Orig date: Sun Oct 8 10:50:20 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/sunlance.c linux/drivers/net/sunlance.c
@@ -1,4 +1,4 @@
-/* $Id: sunlance.c,v 1.103 2000/08/12 19:23:38 anton Exp $
+/* $Id: sunlance.c,v 1.105 2000/10/22 16:08:38 davem Exp $
  * lance.c: Linux/Sparc/Lance driver
  *
  *	Written 1995, 1996 by Miguel de Icaza
@@ -291,9 +291,7 @@
 
 #define LANCE_ADDR(x) ((long)(x) & ~0xff000000)
 
-#ifdef MODULE
 static struct lance_private *root_lance_dev = NULL;
-#endif
 
 /* Load the CSR registers */
 static void load_csrs(struct lance_private *lp)
@@ -1489,11 +1487,10 @@
 	lp->multicast_timer.data = (unsigned long) dev;
 	lp->multicast_timer.function = &lance_set_multicast_retry;
 
-#ifdef MODULE
 	dev->ifindex = dev_new_index();
 	lp->next_module = root_lance_dev;
 	root_lance_dev = lp;
-#endif
+
 	return 0;
 
 fail:
@@ -1524,9 +1521,7 @@
 	static struct sbus_dev sdev;
 	static int called = 0;
 
-#ifdef MODULE
 	root_lance_dev = NULL;
-#endif
 
 	if (called)
 		return -ENODEV;
@@ -1554,9 +1549,7 @@
 	static int called = 0;
 	int cards = 0, v;
 
-#ifdef MODULE
 	root_lance_dev = NULL;
-#endif
 
 	if (called)
 		return -ENODEV;
@@ -1597,7 +1590,6 @@
 
 static void __exit sparc_lance_cleanup(void)
 {
-#ifdef MODULE
 	struct lance_private *lp;
 
 	while (root_lance_dev) {
@@ -1608,7 +1600,6 @@
 		kfree(root_lance_dev->dev);
 		root_lance_dev = lp;
 	}
-#endif /* MODULE */
 }
 
 module_init(sparc_lance_probe);