[parisc-linux-cvs] pa14, allow multiple lasi lan cards

[Helge Deller]

Index: Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile	2001/07/13 04:22:27	1.96
+++ Makefile	2001/07/13 18:39:32
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 6
-EXTRAVERSION = -pa13
+EXTRAVERSION = -pa14
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/gsc/lan.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/gsc/lan.c,v
retrieving revision 1.9
diff -u -r1.9 lan.c
--- lan.c	2001/07/09 02:34:02	1.9
+++ lan.c	2001/07/13 18:39:32
@@ -43,19 +43,16 @@
 
 	printk(KERN_INFO "Found i82596 at 0x%p, IRQ %d\n", d->hpa, irq);
 
-	netdevice = kmalloc(sizeof(*netdevice), GFP_KERNEL);
+	netdevice = alloc_etherdev(NULL,0);
 	if (!netdevice)
-	        return -ENOMEM;
+		return -ENOMEM;
 
-	memset(netdevice, 0, sizeof(*netdevice));
-	strcpy(netdevice->name,"eth0");
 	netdevice->base_addr = (unsigned long) d->hpa;
 	netdevice->irq = irq;
 	netdevice->init =
 		(d->sversion == 0x72) ? asp_i82596_probe :lasi_i82596_probe;
 
-	retval = register_netdevice(netdevice);
-
+	retval = register_netdev(netdevice);
 	if (retval) {
 		printk(KERN_WARNING __FILE__ ": register_netdevice ret'd %d\n", retval);
 		kfree(netdevice);