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

[Dave A. <ai...@us...>]

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

Modified Files:
	vaxlance.c 
Log Message:
DA: hackage for 4000/60 testing see what happens .. will be removed 
later


Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vaxlance.c	2001/07/31 17:47:26	1.13
+++ vaxlance.c	2001/08/14 21:25:43	1.14
@@ -1016,6 +1016,7 @@
 
 	//	lp->vsbus_int=5;
 #ifdef CONFIG_VSBUS
+#ifndef CONFIG_VAX_4000HC
 	{
 	  int num, irq;
 	  autoirq_setup(0);
@@ -1029,10 +1030,14 @@
 	  if (num)
 	    lp->vsbus_int=num;
 	}
+#else
+	lp->vsbus_int=1;
 #endif
+	
+#endif
 
 #ifdef VAX_LANCE_AUTOPROBE_IRQ
-
+#ifndef CONFIG_VAX_4000HC
 	printk("Autoprobing LANCE interrupt vector...");
 
 
@@ -1058,6 +1063,9 @@
 	/* maybe we should stop the LANCE here? */
 
 	vsbus_clear_int(lp->vsbus_int);
+#else
+	dev->irq=254;
+#endif
 	if (dev->irq)
 	  printk(" probed IRQ %d, vsbus %d\n", dev->irq, lp->vsbus_int);
 	else
@@ -1066,6 +1074,7 @@
 	    printk(" failed to detect IRQ line - assuming 0x94.\n");
 	  }
 	/* Fill the dev fields */
+
 #else
 	dev->irq=0x94;
 	printk("Using LANCE interrupt vector %d", dev->irq);