patch-2.3.99-pre7 linux/drivers/net/hp100.c

• Lines: 22
• Date: Tue May 2 12:40:59 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/hp100.c
• Orig date: Wed Apr 26 16:34:08 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/hp100.c linux/drivers/net/hp100.c
@@ -3123,10 +3123,7 @@
 MODULE_PARM(hp100_port, "1-5i");
 #endif
 
-#ifdef LINUX_2_1
-char hp100_name[5][IFNAMSIZ] = { "", "", "", "", "" };
-MODULE_PARM(hp100_name, "1-5c" __MODULE_STRING(IFNAMSIZ));
-#else
+#ifndef LINUX_2_1
 static char devname[5][IFNAMSIZ] = { "", "", "", "", "" };
 static char *hp100_name[5] = { devname[0], devname[1],
                                devname[2], devname[3],
@@ -3162,7 +3159,9 @@
       /* Create device and set basics args */
       hp100_devlist[i] = kmalloc(sizeof(struct net_device), GFP_KERNEL);
       memset(hp100_devlist[i], 0x00, sizeof(struct net_device));
+#ifndef LINUX_2_1
       hp100_devlist[i]->name = hp100_name[i];
+#endif
       hp100_devlist[i]->base_addr = hp100_port[i];
       hp100_devlist[i]->init = &hp100_probe;