Merge branch 'linus' into core/printk

[linux-2.6-omap-h63xx.git] / arch / sh / tools / mach-types

diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index af4b7aa9a6b22ed44ffe3f08add33d8e65885c78..1bba7d36be9067de687cbb2d28065393b2e1369a 100644 (file)
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -21,15 +21,14 @@ HD64465                     HD64465
 7206SE                 SH_7206_SOLUTION_ENGINE
 7343SE                 SH_7343_SOLUTION_ENGINE
 7619SE                 SH_7619_SOLUTION_ENGINE
-7722SE                 SH_7722_SOLUTION_ENGINE         
-7751SE                 SH_7751_SOLUTION_ENGINE         
+7721SE                 SH_7721_SOLUTION_ENGINE
+7722SE                 SH_7722_SOLUTION_ENGINE
+7751SE                 SH_7751_SOLUTION_ENGINE
 7780SE                 SH_7780_SOLUTION_ENGINE
 7751SYSTEMH            SH_7751_SYSTEMH
 HP6XX                  SH_HP6XX
 DREAMCAST              SH_DREAMCAST
-MPC1211                        SH_MPC1211
 SNAPGEAR               SH_SECUREEDGE5410
-HS7751RVOIP            SH_HS7751RVOIP
 EDOSK7705              SH_EDOSK7705
 SH4202_MICRODEV                SH_SH4202_MICRODEV
 SH03                   SH_SH03
@@ -39,10 +38,11 @@ R7780MP                     SH_R7780MP
 R7785RP                        SH_R7785RP
 TITAN                  SH_TITAN
 SHMIN                  SH_SHMIN
-7710VOIPGW             SH_7710VOIPGW
 LBOXRE2                        SH_LBOX_RE2
 X3PROTO                        SH_X3PROTO
 MAGICPANELR2           SH_MAGIC_PANEL_R2
 R2D_PLUS               RTS7751R2D_PLUS
 R2D_1                  RTS7751R2D_1
 CAYMAN                 SH_CAYMAN
+SDK7780                        SH_SDK7780
+MIGOR                  SH_MIGOR