Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 62cc8f9..5bdeef9 100644 (file)
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,10 +12,9 @@
 #
 #   http://www.arm.linux.org.uk/developer/machines/?action=new
 #
-# XXX: This is a cut-down version of the file; it contains only machines that
-# XXX: are in mainline or have been submitted to the machine database within
-# XXX: the last 12 months.  If your entry is missing please email rmk at
-# XXX: <linux@arm.linux.org.uk>
+# This is a cut-down version of the file; it contains only machines that
+# are merged into mainline or have been edited in the machine database
+# within the last 12 months.  References to machine_is_NAME() do not count!
 #
 # Last update: Sat May 7 08:48:24 2011
 #
@@ -65,6 +64,7 @@ h7201                 ARCH_H7201              H7201                   161
 h7202                  ARCH_H7202              H7202                   162
 iq80321                        ARCH_IQ80321            IQ80321                 169
 ks8695                 ARCH_KS8695             KS8695                  180
+karo                   ARCH_KARO               KARO                    190
 smdk2410               ARCH_SMDK2410           SMDK2410                193
 ceiva                  ARCH_CEIVA              CEIVA                   200
 voiceblue              MACH_VOICEBLUE          VOICEBLUE               218
@@ -188,6 +188,7 @@ omap_2430sdp                MACH_OMAP_2430SDP       OMAP_2430SDP            900
 davinci_evm            MACH_DAVINCI_EVM        DAVINCI_EVM             901
 palmz72                        MACH_PALMZ72            PALMZ72                 904
 nxdb500                        MACH_NXDB500            NXDB500                 905
+apf9328                        MACH_APF9328            APF9328                 906
 palmt5                 MACH_PALMT5             PALMT5                  917
 palmtc                 MACH_PALMTC             PALMTC                  918
 omap_apollon           MACH_OMAP_APOLLON       OMAP_APOLLON            919
@@ -271,10 +272,12 @@ pcm038                    MACH_PCM038             PCM038                  1551
 ts_x09                 MACH_TS209              TS209                   1565
 at91cap9adk            MACH_AT91CAP9ADK        AT91CAP9ADK             1566
 mx31moboard            MACH_MX31MOBOARD        MX31MOBOARD             1574
+vision_ep9307          MACH_VISION_EP9307      VISION_EP9307           1578
 terastation_pro2       MACH_TERASTATION_PRO2   TERASTATION_PRO2        1584
 linkstation_pro                MACH_LINKSTATION_PRO    LINKSTATION_PRO         1585
 e350                   MACH_E350               E350                    1596
 ts409                  MACH_TS409              TS409                   1601
+rsi_ews                        MACH_RSI_EWS            RSI_EWS                 1609
 cm_x300                        MACH_CM_X300            CM_X300                 1616
 at91sam9g20ek          MACH_AT91SAM9G20EK      AT91SAM9G20EK           1624
 smdk6410               MACH_SMDK6410           SMDK6410                1626
@@ -331,6 +334,7 @@ smdkc100            MACH_SMDKC100           SMDKC100                1826
 tavorevb               MACH_TAVOREVB           TAVOREVB                1827
 saar                   MACH_SAAR               SAAR                    1828
 at91sam9m10g45ek       MACH_AT91SAM9M10G45EK   AT91SAM9M10G45EK        1830
+usb_a9g20              MACH_USB_A9G20          USB_A9G20               1841
 mxlads                 MACH_MXLADS             MXLADS                  1851
 linkstation_mini       MACH_LINKSTATION_MINI   LINKSTATION_MINI        1858
 afeb9260               MACH_AFEB9260           AFEB9260                1859
@@ -369,6 +373,7 @@ pcm043                      MACH_PCM043             PCM043                  2072
 sheevaplug             MACH_SHEEVAPLUG         SHEEVAPLUG              2097
 avengers_lite          MACH_AVENGERS_LITE      AVENGERS_LITE           2104
 mx51_babbage           MACH_MX51_BABBAGE       MX51_BABBAGE            2125
+tx37                   MACH_TX37               TX37                    2127
 rd78x00_masa           MACH_RD78X00_MASA       RD78X00_MASA            2135
 dm355_leopard          MACH_DM355_LEOPARD      DM355_LEOPARD           2138
 ts219                  MACH_TS219              TS219                   2139
@@ -379,6 +384,7 @@ omap_4430sdp                MACH_OMAP_4430SDP       OMAP_4430SDP            2160
 magx_zn5               MACH_MAGX_ZN5           MAGX_ZN5                2162
 btmavb101              MACH_BTMAVB101          BTMAVB101               2172
 btmawb101              MACH_BTMAWB101          BTMAWB101               2173
+tx25                   MACH_TX25               TX25                    2177
 omap3_torpedo          MACH_OMAP3_TORPEDO      OMAP3_TORPEDO           2178
 anw6410                        MACH_ANW6410            ANW6410                 2183
 imx27_visstrim_m10     MACH_IMX27_VISSTRIM_M10 IMX27_VISSTRIM_M10      2187
@@ -423,6 +429,7 @@ raumfeld_rc         MACH_RAUMFELD_RC        RAUMFELD_RC             2413
 raumfeld_connector     MACH_RAUMFELD_CONNECTOR RAUMFELD_CONNECTOR      2414
 raumfeld_speaker       MACH_RAUMFELD_SPEAKER   RAUMFELD_SPEAKER        2415
 tnetv107x              MACH_TNETV107X          TNETV107X               2418
+mx51_m2id              MACH_MX51_M2ID          MX51_M2ID               2428
 smdkv210               MACH_SMDKV210           SMDKV210                2456
 omap_zoom3             MACH_OMAP_ZOOM3         OMAP_ZOOM3              2464
 omap_3630sdp           MACH_OMAP_3630SDP       OMAP_3630SDP            2465
@@ -433,14 +440,17 @@ omapl138_hawkboard        MACH_OMAPL138_HAWKBOARD OMAPL138_HAWKBOARD      2495
 ts41x                  MACH_TS41X              TS41X                   2502
 phy3250                        MACH_PHY3250            PHY3250                 2511
 mini6410               MACH_MINI6410           MINI6410                2520
+tx51                   MACH_TX51               TX51                    2529
 mx28evk                        MACH_MX28EVK            MX28EVK                 2531
 smartq5                        MACH_SMARTQ5            SMARTQ5                 2534
 davinci_dm6467tevm     MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM      2548
 mxt_td60               MACH_MXT_TD60           MXT_TD60                2550
 riot_bei2              MACH_RIOT_BEI2          RIOT_BEI2               2576
 riot_x37               MACH_RIOT_X37           RIOT_X37                2578
+pca101                 MACH_PCA101             PCA101                  2595
 capc7117               MACH_CAPC7117           CAPC7117                2612
 icontrol               MACH_ICONTROL           ICONTROL                2624
+gplugd                 MACH_GPLUGD             GPLUGD                  2625
 qsd8x50a_st1_5         MACH_QSD8X50A_ST1_5     QSD8X50A_ST1_5          2627
 mx23evk                        MACH_MX23EVK            MX23EVK                 2629
 ap4evb                 MACH_AP4EVB             AP4EVB                  2630
@@ -1113,3 +1123,5 @@ blissc                    MACH_BLISSC             BLISSC                  3491
 thales_adc             MACH_THALES_ADC         THALES_ADC              3492
 ubisys_p9d_evp         MACH_UBISYS_P9D_EVP     UBISYS_P9D_EVP          3493
 atdgp318               MACH_ATDGP318           ATDGP318                3494
+smdk4212               MACH_SMDK4212           SMDK4212                3638
+smdk4412               MACH_SMDK4412           SMDK4412                3765