Merge ../linus

[linux-drm-fsl-dcu.git] / arch / arm / tools / mach-types

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 579c69ae9ff78ac47d3b2e01b2830f6da88d80c2..8bcb838e5444278b66827826862b6542a4e3d0c7 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: Mon Oct 16 21:13:36 2006
+# Last update: Thu Dec 7 17:19:20 2006
 #
 # machine_is_xxx       CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -79,7 +79,7 @@ psionw                        ARCH_PSIONW             PSIONW                  60
 aln                    SA1100_ALN              ALN                     61
 epxa                   ARCH_CAMELOT            CAMELOT                 62
 gds2200                        SA1100_GDS2200          GDS2200                 63
-psion_series7          SA1100_PSION_SERIES7    PSION_SERIES7           64
+netbook                        SA1100_PSION_SERIES7    PSION_SERIES7           64
 xfile                  SA1100_XFILE            XFILE                   65
 accelent_ep9312                ARCH_ACCELENT_EP9312    ACCELENT_EP9312         66
 ic200                  ARCH_IC200              IC200                   67
@@ -810,9 +810,9 @@ sb3010                      MACH_SB3010             SB3010                  795
 rm9200                 MACH_RM9200             RM9200                  796
 dma03                  MACH_DMA03              DMA03                   797
 road_s101              MACH_ROAD_S101          ROAD_S101               798
-iq_nextgen_a           MACH_IQ_NEXTGEN_A       IQ_NEXTGEN_A            799
+iq81340sc              MACH_IQ81340SC          IQ81340SC               799
 iq_nextgen_b           MACH_IQ_NEXTGEN_B       IQ_NEXTGEN_B            800
-iq_nextgen_c           MACH_IQ_NEXTGEN_C       IQ_NEXTGEN_C            801
+iq81340mc              MACH_IQ81340MC          IQ81340MC               801
 iq_nextgen_d           MACH_IQ_NEXTGEN_D       IQ_NEXTGEN_D            802
 iq_nextgen_e           MACH_IQ_NEXTGEN_E       IQ_NEXTGEN_E            803
 mallow_at91            MACH_MALLOW_AT91        MALLOW_AT91             804
@@ -1165,9 +1165,57 @@ pnx4010                  MACH_PNX4010            PNX4010                 1151
 oxnas                  MACH_OXNAS              OXNAS                   1152
 fiori                  MACH_FIORI              FIORI                   1153
 ml1200                 MACH_ML1200             ML1200                  1154
-cactus                 MACH_CACTUS             CACTUS                  1155
+pecos                  MACH_PECOS              PECOS                   1155
 nb2xxx                 MACH_NB2XXX             NB2XXX                  1156
 hw6900                 MACH_HW6900             HW6900                  1157
 cdcs_quoll             MACH_CDCS_QUOLL         CDCS_QUOLL              1158
 quicksilver            MACH_QUICKSILVER        QUICKSILVER             1159
 uplat926               MACH_UPLAT926           UPLAT926                1160
+dep2410_dep2410                MACH_DEP2410_THOMAS     DEP2410_THOMAS          1161
+dtk2410                        MACH_DTK2410            DTK2410                 1162
+chili                  MACH_CHILI              CHILI                   1163
+demeter                        MACH_DEMETER            DEMETER                 1164
+dionysus               MACH_DIONYSUS           DIONYSUS                1165
+as352x                 MACH_AS352X             AS352X                  1166
+service                        MACH_SERVICE            SERVICE                 1167
+cs_e9301               MACH_CS_E9301           CS_E9301                1168
+micro9m                        MACH_MICRO9M            MICRO9M                 1169
+ia_mospck              MACH_IA_MOSPCK          IA_MOSPCK               1170
+ql201b                 MACH_QL201B             QL201B                  1171
+bbm                    MACH_BBM                BBM                     1174
+exxx                   MACH_EXXX               EXXX                    1175
+wma11b                 MACH_WMA11B             WMA11B                  1176
+pelco_atlas            MACH_PELCO_ATLAS        PELCO_ATLAS             1177
+g500                   MACH_G500               G500                    1178
+bug                    MACH_BUG                BUG                     1179
+mx33ads                        MACH_MX33ADS            MX33ADS                 1180
+chub                   MACH_CHUB               CHUB                    1181
+gta01                  MACH_GTA01              GTA01                   1182
+w90n740                        MACH_W90N740            W90N740                 1183
+medallion_sa2410       MACH_MEDALLION_SA2410   MEDALLION_SA2410        1184
+ia_cpu_9200_2          MACH_IA_CPU_9200_2      IA_CPU_9200_2           1185
+dimmrm9200             MACH_DIMMRM9200         DIMMRM9200              1186
+pm9261                 MACH_PM9261             PM9261                  1187
+mx21                   MACH_MX21               MX21                    1188
+ml7304                 MACH_ML7304             ML7304                  1189
+ucp250                 MACH_UCP250             UCP250                  1190
+intboard               MACH_INTBOARD           INTBOARD                1191
+gulfstream             MACH_GULFSTREAM         GULFSTREAM              1192
+labquest               MACH_LABQUEST           LABQUEST                1193
+vcmx313                        MACH_VCMX313            VCMX313                 1194
+urg200                 MACH_URG200             URG200                  1195
+cpux255lcdnet          MACH_CPUX255LCDNET      CPUX255LCDNET           1196
+netdcu9                        MACH_NETDCU9            NETDCU9                 1197
+netdcu10               MACH_NETDCU10           NETDCU10                1198
+dspg_dga               MACH_DSPG_DGA           DSPG_DGA                1199
+dspg_dvw               MACH_DSPG_DVW           DSPG_DVW                1200
+solos                  MACH_SOLOS              SOLOS                   1201
+at91sam9263ek          MACH_AT91SAM9263EK      AT91SAM9263EK           1202
+osstbox                        MACH_OSSTBOX            OSSTBOX                 1203
+kbat9261               MACH_KBAT9261           KBAT9261                1204
+ct1100                 MACH_CT1100             CT1100                  1205
+akcppxa                        MACH_AKCPPXA            AKCPPXA                 1206
+zevio_1020             MACH_ZEVIO_1020         ZEVIO_1020              1207
+hitrack                        MACH_HITRACK            HITRACK                 1208
+syme1                  MACH_SYME1              SYME1                   1209
+syhl1                  MACH_SYHL1              SYHL1                   1210