[Linux-mips-commits]CVS: linux/include/asm-mips bootinfo.h,1.9,1.10 irq.h,1.3,1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/include/asm-mips
In directory usw-pr-cvs1:/tmp/cvs-serv30742/include/asm-mips

Modified Files:
	bootinfo.h irq.h 
Log Message:
Merged Vr4111 (Clio-1000) patch from Jim Paris.



Index: bootinfo.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/bootinfo.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- bootinfo.h	2001/10/24 23:32:54	1.9
+++ bootinfo.h	2001/10/28 23:04:19	1.10
@@ -203,8 +203,9 @@
 #define MACH_NEC_OSPREY                0       /* Osprey eval board */
 #define MACH_NEC_EAGLE                 1       /* NEC Eagle board */
 #define MACH_NEC_KORVA                 2       /* NEC korva board */
+#define MACH_VADEM_CLIO_1000           3       /* Vadem Clio 1000 */
 
-#define GROUP_NEC_VR41XX_NAMES { "Osprey", "Eagle", "Korva" }
+#define GROUP_NEC_VR41XX_NAMES { "Osprey", "Eagle", "Korva", "Clio 1000" }
 
 /*
  * Valid machtype for group EE

Index: irq.h
===================================================================
RCS file: /cvsroot/linux-mips/linux/include/asm-mips/irq.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- irq.h	2001/08/25 02:19:28	1.3
+++ irq.h	2001/10/28 23:04:19	1.4
@@ -11,7 +11,7 @@
 
 #include <linux/config.h>
 
-#define NR_IRQS 64		/* Largest number of ints of all machines.  */
+#define NR_IRQS 128		/* Largest number of ints of all machines.  */
 
 #define TIMER_IRQ 0