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

[Richard B. <rb...@us...>]

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

Modified Files:
	vaxsgec.c 
Log Message:
Changed default interrupt when using ka55 cpu


Index: vaxsgec.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxsgec.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vaxsgec.c	3 Jun 2002 02:43:45 -0000	1.14
+++ vaxsgec.c	29 Nov 2002 04:30:14 -0000	1.15
@@ -27,6 +27,7 @@
 #include <asm/pgalloc.h>         /* for __flush_tlb_one */
 #include <asm/vsa.h>
 #include <asm/mv.h>
+extern int is_ka55(void);
 
 /* use #undef to turn these off */
 #undef VAX_SGEC_DEBUG
@@ -46,6 +47,7 @@
   *regptr = value;
 }
 
+
 static inline void writecsr6(volatile struct sgec_regs *regs, unsigned long value)
 {
   writereg(&regs->sg_nicsr6, value);
@@ -1001,7 +1003,11 @@
 		dev->irq=SGECVEC;
 		/* 0x80 is probably not the best vector but it's where the sgec
 		   is ending up after we reset it, so force it there for now */
-		dev->irq = 0x80;
+		if (is_ka55()) {
+		  dev->irq = 0x108;
+		} else {
+		  dev->irq = 0x80;
+		}
 		printk(" failed to detect IRQ line - assuming 0x%x.\n", 
 		       dev->irq);
 	}