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

Next file: linux/drivers/net/ni52.c
Previous file: linux/drivers/net/ne3210.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/ni5010.c linux/drivers/net/ni5010.c
@@ -235,14 +235,6 @@
 	
 	PRINTK2((KERN_DEBUG "%s: I/O #3 passed!\n", dev->name));
 
-	if (dev == NULL) {
-		dev = init_etherdev(0,0);
-		if (dev == NULL) {
-			printk(KERN_WARNING "%s: Failed to allocate device memory\n", boardname);
-			return -ENOMEM;
-		}
-	}
-
 	if (NI5010_DEBUG && version_printed++ == 0)
 		printk(KERN_INFO "%s", version);
 
@@ -741,14 +733,9 @@
 }
 
 #ifdef MODULE
-static struct net_device dev_ni5010 = {
-        "",
-        0, 0, 0, 0,
-        0, 0,
-        0, 0, 0, NULL, ni5010_probe };
-
-int io  = 0;
-int irq = 0;
+static struct net_device dev_ni5010 = { init: ni5010_probe };
+static int io;
+static int irq;
 
 MODULE_PARM(io, "i");
 MODULE_PARM(irq, "i");

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)