Merge ../linus

[pandora-kernel.git] / arch / arm / tools / mach-types

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 6d7de9c..e1372a2 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 May 8 20:11:05 2006
+# Last update: Mon Jun 26 22:26:08 2006
 #
 # machine_is_xxx       CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -566,8 +566,8 @@ switchgrass         MACH_SWITCHGRASS        SWITCHGRASS             549
 ens_cmu                        MACH_ENS_CMU            ENS_CMU                 550
 mm6_sdb                        MACH_MM6_SDB            MM6_SDB                 551
 saturn                 MACH_SATURN             SATURN                  552
-i30030evb              MACH_ARGONPLUSEVB       ARGONPLUSEVB            553
-mxc27530evb            MACH_SCMA11EVB          SCMA11EVB               554
+i30030evb              MACH_I30030EVB          I30030EVB               553
+mxc27530evb            MACH_MXC27530EVB        MXC27530EVB             554
 smdk2800               MACH_SMDK2800           SMDK2800                555
 mtwilson               MACH_MTWILSON           MTWILSON                556
 ziti                   MACH_ZITI               ZITI                    557
@@ -647,7 +647,7 @@ sendt                       MACH_SENDT              SENDT                   630
 mx2jazz                        MACH_MX2JAZZ            MX2JAZZ                 631
 multiio                        MACH_MULTIIO            MULTIIO                 632
 hrdisplay              MACH_HRDISPLAY          HRDISPLAY               633
-mxc27530ads            MACH_SCMA11BB           SCMA11BB                634
+mxc27530ads            MACH_MXC27530ADS        MXC27530ADS             634
 trizeps3               MACH_TRIZEPS3           TRIZEPS3                635
 zefeerdza              MACH_ZEFEERDZA          ZEFEERDZA               636
 zefeerdzb              MACH_ZEFEERDZB          ZEFEERDZB               637
@@ -721,7 +721,7 @@ gp32                        MACH_GP32               GP32                    706
 gem                    MACH_GEM                GEM                     707
 i858                   MACH_I858               I858                    708
 hx2750                 MACH_HX2750             HX2750                  709
-mxc91131evb            MACH_ZEUSEVB            ZEUSEVB                 710
+mxc91131evb            MACH_MXC91131EVB        MXC91131EVB             710
 p700                   MACH_P700               P700                    711
 cpe                    MACH_CPE                CPE                     712
 spitz                  MACH_SPITZ              SPITZ                   713
@@ -802,7 +802,7 @@ cpuat91                     MACH_CPUAT91            CPUAT91                 787
 rea9200                        MACH_REA9200            REA9200                 788
 acts_pune_sa1110       MACH_ACTS_PUNE_SA1110   ACTS_PUNE_SA1110        789
 ixp425                 MACH_IXP425             IXP425                  790
-i30030ads              MACH_ARGONPLUSODYSSEY   ARGONPLUSODYSSEY        791
+i30030ads              MACH_I30030ADS          I30030ADS               791
 perch                  MACH_PERCH              PERCH                   792
 eis05r1                        MACH_EIS05R1            EIS05R1                 793
 pepperpad              MACH_PEPPERPAD          PEPPERPAD               794
@@ -930,7 +930,7 @@ netclient           MACH_NETCLIENT          NETCLIENT               916
 xscale_palmtt5         MACH_XSCALE_PALMTT5     XSCALE_PALMTT5          917
 xscale_palmtc          MACH_OMAP_PALMTC        OMAP_PALMTC             918
 omap_apollon           MACH_OMAP_APOLLON       OMAP_APOLLON            919
-mxc30030evb            MACH_ARGONLVEVB         ARGONLVEVB              920
+mxc30030evb            MACH_MXC30030EVB        MXC30030EVB             920
 rea_2d                 MACH_REA_2D             REA_2D                  921
 eti3e524               MACH_TI3E524            TI3E524                 922
 ateb9200               MACH_ATEB9200           ATEB9200                923
@@ -986,7 +986,7 @@ redfox                      MACH_REDFOX             REDFOX                  972
 mysh_ep9315_1          MACH_MYSH_EP9315_1      MYSH_EP9315_1           973
 tpf106                 MACH_TPF106             TPF106                  974
 at91rm9200kg           MACH_AT91RM9200KG       AT91RM9200KG            975
-racemt2                        MACH_SLEDB              SLEDB                   976
+rcmt2                  MACH_SLEDB              SLEDB                   976
 ontrack                        MACH_ONTRACK            ONTRACK                 977
 pm1200                 MACH_PM1200             PM1200                  978
 ess24562               MACH_ESS24XXX           ESS24XXX                979
@@ -1022,7 +1022,7 @@ smdk2440          MACH_SMDK2440           SMDK2440                1008
 smdk2412               MACH_SMDK2412           SMDK2412                1009
 webbox                 MACH_WEBBOX             WEBBOX                  1010
 cwwndp                 MACH_CWWNDP             CWWNDP                  1011
-dragon                 MACH_DRAGON             DRAGON                  1012
+i839                   MACH_DRAGON             DRAGON                  1012
 opendo_cpu_board       MACH_OPENDO_CPU_BOARD   OPENDO_CPU_BOARD        1013
 ccm2200                        MACH_CCM2200            CCM2200                 1014
 etwarm                 MACH_ETWARM             ETWARM                  1015
@@ -1040,3 +1040,56 @@ edg79524         MACH_EDG79524           EDG79524                1026
 ai2410                 MACH_AI2410             AI2410                  1027
 ixp465                 MACH_IXP465             IXP465                  1028
 balloon3               MACH_BALLOON3           BALLOON3                1029
+heins                  MACH_HEINS              HEINS                   1030
+mpluseva               MACH_MPLUSEVA           MPLUSEVA                1031
+rt042                  MACH_RT042              RT042                   1032
+cwiem                  MACH_CWIEM              CWIEM                   1033
+cm_x270                        MACH_CM_X270            CM_X270                 1034
+cm_x255                        MACH_CM_X255            CM_X255                 1035
+esh_at91               MACH_ESH_AT91           ESH_AT91                1036
+sandgate3              MACH_SANDGATE3          SANDGATE3               1037
+primo                  MACH_PRIMO              PRIMO                   1038
+gemstone               MACH_GEMSTONE           GEMSTONE                1039
+pronghorn_metro                MACH_PRONGHORNMETRO     PRONGHORNMETRO          1040
+sidewinder             MACH_SIDEWINDER         SIDEWINDER              1041
+picomod1               MACH_PICOMOD1           PICOMOD1                1042
+sg590                  MACH_SG590              SG590                   1043
+akai9307               MACH_AKAI9307           AKAI9307                1044
+fontaine               MACH_FONTAINE           FONTAINE                1045
+wombat                 MACH_WOMBAT             WOMBAT                  1046
+acq300                 MACH_ACQ300             ACQ300                  1047
+mod_270                        MACH_MOD_270            MOD_270                 1048
+vmc_vc0820             MACH_VC0820             VC0820                  1049
+ani_aim                        MACH_ANI_AIM            ANI_AIM                 1050
+jellyfish              MACH_JELLYFISH          JELLYFISH               1051
+amanita                        MACH_AMANITA            AMANITA                 1052
+vlink                  MACH_VLINK              VLINK                   1053
+dexflex                        MACH_DEXFLEX            DEXFLEX                 1054
+eigen_ttq              MACH_EIGEN_TTQ          EIGEN_TTQ               1055
+arcom_titan            MACH_ARCOM_TITAN        ARCOM_TITAN             1056
+tabla                  MACH_TABLA              TABLA                   1057
+mdirac3                        MACH_MDIRAC3            MDIRAC3                 1058
+mrhfbp2                        MACH_MRHFBP2            MRHFBP2                 1059
+at91rm9200rb           MACH_AT91RM9200RB       AT91RM9200RB            1060
+ani_apm                        MACH_ANI_APM            ANI_APM                 1061
+ella1                  MACH_ELLA1              ELLA1                   1062
+inhand_pxa27x          MACH_INHAND_PXA27X      INHAND_PXA27X           1063
+inhand_pxa25x          MACH_INHAND_PXA25X      INHAND_PXA25X           1064
+empos_xm               MACH_EMPOS_XM           EMPOS_XM                1065
+empos                  MACH_EMPOS              EMPOS                   1066
+empos_tiny             MACH_EMPOS_TINY         EMPOS_TINY              1067
+empos_sm               MACH_EMPOS_SM           EMPOS_SM                1068
+egret                  MACH_EGRET              EGRET                   1069
+ostrich                        MACH_OSTRICH            OSTRICH                 1070
+n50                    MACH_N50                N50                     1071
+ecbat91                        MACH_ECBAT91            ECBAT91                 1072
+stareast               MACH_STAREAST           STAREAST                1073
+dspg_dw                        MACH_DSPG_DW            DSPG_DW                 1074
+onearm                 MACH_ONEARM             ONEARM                  1075
+mrg110_6               MACH_MRG110_6           MRG110_6                1076
+wrt300nv2              MACH_WRT300NV2          WRT300NV2               1077
+xm_bulverde            MACH_XM_BULVERDE        XM_BULVERDE             1078
+msm6100                        MACH_MSM6100            MSM6100                 1079
+eti_b1                 MACH_ETI_B1             ETI_B1                  1080
+za9l_series            MACH_ZILOG_ZA9L         ZILOG_ZA9L              1081
+bit2440                        MACH_BIT2440            BIT2440                 1082