Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

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

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index b4211d8b2ac706de53314c2d95d3ccaedeaa98b0..945e0d237a1dfc6c3016090972813d7d32ba128e 100644 (file)
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
 #
 #   http://www.arm.linux.org.uk/developer/machines/?action=new
 #
-# Last update: Thu Mar 12 18:01:45 2009
+# Last update: Mon Mar 23 20:09:01 2009
 #
 # machine_is_xxx       CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -2124,3 +2124,11 @@ mx27wallace              MACH_MX27WALLACE        MX27WALLACE             2133
 fmzwebmodul            MACH_FMZWEBMODUL        FMZWEBMODUL             2134
 rd78x00_masa           MACH_RD78X00_MASA       RD78X00_MASA            2135
 smallogger             MACH_SMALLOGGER         SMALLOGGER              2136
+ccw9p9215              MACH_CCW9P9215          CCW9P9215               2137
+dm355_leopard          MACH_DM355_LEOPARD      DM355_LEOPARD           2138
+ts219                  MACH_TS219              TS219                   2139
+tny_a9263              MACH_TNY_A9263          TNY_A9263               2140
+apollo                 MACH_APOLLO             APOLLO                  2141
+at91cap9stk            MACH_AT91CAP9STK        AT91CAP9STK             2142
+spc300                 MACH_SPC300             SPC300                  2143
+eko                    MACH_EKO                EKO                     2144