CVS Update@linux-mips.org: linux

[ths@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ths@ftp.linux-mips.org  05/07/08 08:36:52

Modified files:
        arch/mips/arc  : identify.c 
        include/asm-mips: bootinfo.h 

Log message:
        IP30 Identification.

diff -urN linux/arch/mips/arc/identify.c linux/arch/mips/arc/identify.c
--- linux/arch/mips/arc/identify.c      2004/08/31 17:01:08     1.13
+++ linux/arch/mips/arc/identify.c      2005/07/08 07:36:51     1.14
@@ -44,6 +44,11 @@
                MACH_GROUP_SGI,
                MACH_SGI_IP28,
                PROM_FLAG_ARCS
+       }, {    "SGI-IP30",
+               "SGI Octane",
+               MACH_GROUP_SGI,
+               MACH_SGI_IP30,
+               PROM_FLAG_ARCS
        }, {    "SGI-IP32",
                "SGI O2",
                MACH_GROUP_SGI,
diff -urN linux/include/asm-mips/bootinfo.h linux/include/asm-mips/bootinfo.h
--- linux/include/asm-mips/bootinfo.h   2005/03/01 06:33:17     1.80
+++ linux/include/asm-mips/bootinfo.h   2005/07/08 07:36:51     1.81
@@ -77,6 +77,7 @@
 #define  MACH_SGI_IP27         1       /* Origin 200, Origin 2000, Onyx 2 */
 #define  MACH_SGI_IP28         2       /* Indigo2 Impact               */
 #define  MACH_SGI_IP32         3       /* O2                           */
+#define  MACH_SGI_IP30         4       /* Octane, Octane2              */
 
 /*
  * Valid machtype for group COBALT