Pull trivial into test branch

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

diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index 78c35ec463624d2c4d337f9dbd2d2c2a25701301..8e321f53a38270570056b9d1bc5ae1fec70deaea 100644 (file)
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -124,12 +124,6 @@
 #define  MACH_MOMENCO_JAGUAR_ATX 3
 #define  MACH_MOMENCO_OCELOT_3 4
 
-/*
- * Valid machtype for group ITE
- */
-#define MACH_GROUP_ITE         13      /* ITE Semi Eval Boards         */
-#define  MACH_QED_4N_S01B      0       /* ITE8172 based eval board */
-
 /*
  * Valid machtype for group PHILIPS
  */
@@ -137,12 +131,7 @@
 #define  MACH_PHILIPS_NINO     0       /* Nino */
 #define  MACH_PHILIPS_VELO     1       /* Velo */
 #define  MACH_PHILIPS_JBS      2       /* JBS */
-
-/*
- * Valid machtype for group Globespan
- */
-#define MACH_GROUP_GLOBESPAN   15      /* Globespan */
-#define  MACH_IVR              0       /* IVR eval board */
+#define  MACH_PHILIPS_STB810   3       /* STB810 */
 
 /*
  * Valid machtype for group SIBYTE