Merge branch 'master' of ../linux-2.6/

[linux-2.6] / arch / sh / tools / mach-types

diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types
index ff071693325c48ff679cecc5da788afe6e9887ac..67997af25c0c3fa0b7a68d919aee59d956618dcf 100644 (file)
--- a/arch/sh/tools/mach-types
+++ b/arch/sh/tools/mach-types
@@ -29,7 +29,6 @@ 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
@@ -45,3 +44,6 @@ 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