Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

[linux-2.6] / include / asm-mips / bootinfo.h

diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index 404856e6b82d87bc0459c0fac2e210f6a9be75f4..14fc88f2722640bc364ad563f700cffc22e171c8 100644 (file)
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -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
@@ -136,6 +137,7 @@
 #define MACH_GROUP_PHILIPS     14
 #define  MACH_PHILIPS_NINO     0       /* Nino */
 #define  MACH_PHILIPS_VELO     1       /* Velo */
+#define  MACH_PHILIPS_JBS      2       /* JBS */
 
 /*
  * Valid machtype for group Globespan
@@ -159,6 +161,7 @@
 #define  MACH_TOSHIBA_JMR3927  3       /* JMR-TX3927 CPU/IO board */
 #define  MACH_TOSHIBA_RBTX4927 4
 #define  MACH_TOSHIBA_RBTX4937 5
+#define  MACH_TOSHIBA_RBTX4938 6
 
 #define GROUP_TOSHIBA_NAMES    { "Pallas", "TopasCE", "JMR", "JMR TX3927", \
                                  "RBTX4927", "RBTX4937" }