patch-2.4.0-test10 linux/drivers/net/ne3210.c
Next file: linux/drivers/net/ni5010.c
Previous file: linux/drivers/net/ne2.c
Back to the patch index
Back to the overall index
- Lines: 36
- Date:
Mon Oct 30 12:24:22 2000
- Orig file:
v2.4.0-test9/linux/drivers/net/ne3210.c
- Orig date:
Mon Jun 19 13:30:59 2000
diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/ne3210.c linux/drivers/net/ne3210.c
@@ -157,12 +157,6 @@
}
#endif
- /* We should have a "dev" from Space.c or the static module table. */
- if (dev == NULL) {
- printk("ne3210.c: Passed a NULL device.\n");
- dev = init_etherdev(0, 0);
- }
-
/* Allocate dev->priv and fill in 8390 specific dev fields. */
if (ethdev_init(dev)) {
printk ("ne3210.c: unable to allocate memory for dev->priv!\n");
@@ -360,18 +354,10 @@
#ifdef MODULE
#define MAX_NE3210_CARDS 4 /* Max number of NE3210 cards per module */
-static struct net_device dev_ne3210[MAX_NE3210_CARDS] = {
- {
- "",
- 0, 0, 0, 0,
- 0, 0,
- 0, 0, 0, NULL, NULL
- },
-};
-
-static int io[MAX_NE3210_CARDS] = { 0, };
-static int irq[MAX_NE3210_CARDS] = { 0, };
-static int mem[MAX_NE3210_CARDS] = { 0, };
+static struct net_device dev_ne3210[MAX_NE3210_CARDS];
+static int io[MAX_NE3210_CARDS];
+static int irq[MAX_NE3210_CARDS];
+static int mem[MAX_NE3210_CARDS];
MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE3210_CARDS) "i");
MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE3210_CARDS) "i");
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)