[LV-kern-commit] CVS: kernel-2.4/drivers/net vaxlance.c,1.16,1.17

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv32063/net

Modified Files:
	vaxlance.c 
Log Message:
Slightly better irq handling. is_ka46 now can be used to switch 
on the fly between system dependent behaviour, so we can use the same
kernel config on two machines.


Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- vaxlance.c	2001/09/05 10:16:40	1.16
+++ vaxlance.c	2001/09/16 15:13:09	1.17
@@ -1031,7 +1031,7 @@
 	    lp->vsbus_int=num;
 	}
 #else
-	lp->vsbus_int=1;
+       if (is_ka46()) lp->vsbus_int=1; else lp->vsbus_int=5;
 #endif
 	
 #endif
@@ -1064,7 +1064,7 @@
 
 	vsbus_clear_int(lp->vsbus_int);
 #else
-	dev->irq=254;
+	if (is_ka46()) dev->irq=254; else dev->irq=0x94; 
 #endif
 	if (dev->irq)
 	  printk(" probed IRQ %d, vsbus %d\n", dev->irq, lp->vsbus_int);