+--- 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 Feb 7 08:59:27 2011
++# Last update: Tue Mar 1 10:53:16 2011
+ #
+ # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
+ #
+@@ -1319,7 +1319,6 @@ mistral MACH_MISTRAL MISTRAL 1315
+ msm MACH_MSM MSM 1316
+ ct5910 MACH_CT5910 CT5910 1317
+ ct5912 MACH_CT5912 CT5912 1318
+-hynet_ine MACH_HYNET_INE HYNET_INE 1319
+ hynet_app MACH_HYNET_APP HYNET_APP 1320
+ msm7200 MACH_MSM7200 MSM7200 1321
+ msm7600 MACH_MSM7600 MSM7600 1322
+@@ -1777,7 +1776,6 @@ wdg002 MACH_WDG002 WDG002 1785
+ sg560adsl MACH_SG560ADSL SG560ADSL 1786
+ nextio_n2800_ica MACH_NEXTIO_N2800_ICA NEXTIO_N2800_ICA 1787
+ dove_db MACH_DOVE_DB DOVE_DB 1788
+-marvell_newdb MACH_MARVELL_NEWDB MARVELL_NEWDB 1789
+ vandihud MACH_VANDIHUD VANDIHUD 1790
+ magx_e8 MACH_MAGX_E8 MAGX_E8 1791
+ magx_z6 MACH_MAGX_Z6 MAGX_Z6 1792
+@@ -1877,7 +1875,6 @@ ued MACH_UED UED 1885
+ esiblade MACH_ESIBLADE ESIBLADE 1886
+ eye02 MACH_EYE02 EYE02 1887
+ imx27kbd MACH_IMX27KBD IMX27KBD 1888
+-sst61vc010_fpga MACH_SST61VC010_FPGA SST61VC010_FPGA 1889
+ kixvp435 MACH_KIXVP435 KIXVP435 1890
+ kixnp435 MACH_KIXNP435 KIXNP435 1891
+ africa MACH_AFRICA AFRICA 1892
+@@ -2308,7 +2305,6 @@ ecac2378 MACH_ECAC2378 ECAC2378 2319
+ tazkiosk MACH_TAZKIOSK TAZKIOSK 2320
+ whiterabbit_mch MACH_WHITERABBIT_MCH WHITERABBIT_MCH 2321
+ sbox9263 MACH_SBOX9263 SBOX9263 2322
+-oreo MACH_OREO OREO 2323
+ smdk6442 MACH_SMDK6442 SMDK6442 2324
+ openrd_base MACH_OPENRD_BASE OPENRD_BASE 2325
+ incredible MACH_INCREDIBLE INCREDIBLE 2326
+@@ -2374,7 +2370,6 @@ sch_m490 MACH_SCH_M490 SCH_M490 2386
+ rbl01 MACH_RBL01 RBL01 2387
+ omnifi MACH_OMNIFI OMNIFI 2388
+ otavalo MACH_OTAVALO OTAVALO 2389
+-sienna MACH_SIENNA SIENNA 2390
+ htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391
+ htc_opal MACH_HTC_OPAL HTC_OPAL 2392
+ touchbook MACH_TOUCHBOOK TOUCHBOOK 2393
+@@ -2446,7 +2441,6 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1
+ siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459
+ sm3k MACH_SM3K SM3K 2460
+ acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461
+-sst61vc010_dev MACH_SST61VC010_DEV SST61VC010_DEV 2462
+ glittertind MACH_GLITTERTIND GLITTERTIND 2463
+ omap_zoom3 MACH_OMAP_ZOOM3 OMAP_ZOOM3 2464
+ omap_3630sdp MACH_OMAP_3630SDP OMAP_3630SDP 2465
+@@ -2498,7 +2492,6 @@ hiram MACH_HIRAM HIRAM 2510
+ phy3250 MACH_PHY3250 PHY3250 2511
+ ea3250 MACH_EA3250 EA3250 2512
+ fdi3250 MACH_FDI3250 FDI3250 2513
+-whitestone MACH_WHITESTONE WHITESTONE 2514
+ at91sam9263nit MACH_AT91SAM9263NIT AT91SAM9263NIT 2515
+ ccmx51 MACH_CCMX51 CCMX51 2516
+ ccmx51js MACH_CCMX51JS CCMX51JS 2517
+@@ -2561,7 +2554,6 @@ magnolia2 MACH_MAGNOLIA2 MAGNOLIA2 25
+ emxx MACH_EMXX EMXX 2574
+ outlaw MACH_OUTLAW OUTLAW 2575
+ riot_bei2 MACH_RIOT_BEI2 RIOT_BEI2 2576
+-riot_vox MACH_RIOT_VOX RIOT_VOX 2577
+ riot_x37 MACH_RIOT_X37 RIOT_X37 2578
+ mega25mx MACH_MEGA25MX MEGA25MX 2579
+ benzina2 MACH_BENZINA2 BENZINA2 2580
+@@ -2582,7 +2574,6 @@ omap3_bulldog MACH_OMAP3_BULLDOG OMAP3_
+ pca101 MACH_PCA101 PCA101 2595
+ buzzc MACH_BUZZC BUZZC 2596
+ sasie2 MACH_SASIE2 SASIE2 2597
+-davinci_cio MACH_DAVINCI_CIO DAVINCI_CIO 2598
+ smartmeter_dl MACH_SMARTMETER_DL SMARTMETER_DL 2599
+ wzl6410 MACH_WZL6410 WZL6410 2600
+ wzl6410m MACH_WZL6410M WZL6410M 2601
+@@ -2591,7 +2582,6 @@ wzl6410i MACH_WZL6410I WZL6410I 2603
+ spacecom1 MACH_SPACECOM1 SPACECOM1 2604
+ pingu920 MACH_PINGU920 PINGU920 2605
+ bravoc MACH_BRAVOC BRAVOC 2606
+-cybo2440 MACH_CYBO2440 CYBO2440 2607
+ vdssw MACH_VDSSW VDSSW 2608
+ romulus MACH_ROMULUS ROMULUS 2609
+ omap_magic MACH_OMAP_MAGIC OMAP_MAGIC 2610
+@@ -2683,7 +2673,6 @@ lkevm MACH_LKEVM LKEVM 2695
+ mw6410 MACH_MW6410 MW6410 2696
+ terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
+ cpu8000e MACH_CPU8000E CPU8000E 2698
+-catania MACH_CATANIA CATANIA 2699
+ tokyo MACH_TOKYO TOKYO 2700
+ msm7201a_surf MACH_MSM7201A_SURF MSM7201A_SURF 2701
+ msm7201a_ffa MACH_MSM7201A_FFA MSM7201A_FFA 2702
+@@ -2741,7 +2730,6 @@ wbd222 MACH_WBD222 WBD222 2753
+ mt65xx MACH_MT65XX MT65XX 2754
+ msm8x60_surf MACH_MSM8X60_SURF MSM8X60_SURF 2755
+ msm8x60_sim MACH_MSM8X60_SIM MSM8X60_SIM 2756
+-vmc300 MACH_VMC300 VMC300 2757
+ tcc8000_sdk MACH_TCC8000_SDK TCC8000_SDK 2758
+ nanos MACH_NANOS NANOS 2759
+ stamp9g10 MACH_STAMP9G10 STAMP9G10 2760
+@@ -2750,7 +2738,6 @@ h6053 MACH_H6053 H6053 2762
+ smint01 MACH_SMINT01 SMINT01 2763
+ prtlvt2 MACH_PRTLVT2 PRTLVT2 2764
+ ap420 MACH_AP420 AP420 2765
+-htcshift MACH_HTCSHIFT HTCSHIFT 2766
+ davinci_dm365_fc MACH_DAVINCI_DM365_FC DAVINCI_DM365_FC 2767
+ msm8x55_surf MACH_MSM8X55_SURF MSM8X55_SURF 2768
+ msm8x55_ffa MACH_MSM8X55_FFA MSM8X55_FFA 2769
+@@ -2761,7 +2748,6 @@ oreo_controller MACH_OREO_CONTROLLER OR
+ kopin_models MACH_KOPIN_MODELS KOPIN_MODELS 2774
+ ttc_vision2 MACH_TTC_VISION2 TTC_VISION2 2775
+ cns3420vb MACH_CNS3420VB CNS3420VB 2776
+-lpc2 MACH_LPC2 LPC2 2777
+ olympus MACH_OLYMPUS OLYMPUS 2778
+ vortex MACH_VORTEX VORTEX 2779
+ s5pc200 MACH_S5PC200 S5PC200 2780
+@@ -2788,7 +2774,6 @@ ti8168evm MACH_TI8168EVM TI8168EVM 28
+ neocoreomap MACH_NEOCOREOMAP NEOCOREOMAP 2801
+ withings_wbp MACH_WITHINGS_WBP WITHINGS_WBP 2802
+ dbps MACH_DBPS DBPS 2803
+-sbc9261 MACH_SBC9261 SBC9261 2804
+ pcbfp0001 MACH_PCBFP0001 PCBFP0001 2805
+ speedy MACH_SPEEDY SPEEDY 2806
+ chrysaor MACH_CHRYSAOR CHRYSAOR 2807
+@@ -2812,7 +2797,6 @@ p565 MACH_P565 P565 2824
+ acer_a4 MACH_ACER_A4 ACER_A4 2825
+ davinci_dm368_bip MACH_DAVINCI_DM368_BIP DAVINCI_DM368_BIP 2826
+ eshare MACH_ESHARE ESHARE 2827
+-hw_omapl138_europa MACH_HW_OMAPL138_EUROPA HW_OMAPL138_EUROPA 2828
+ wlbargn MACH_WLBARGN WLBARGN 2829
+ bm170 MACH_BM170 BM170 2830
+ netspace_mini_v2 MACH_NETSPACE_MINI_V2 NETSPACE_MINI_V2 2831
+@@ -2879,7 +2863,6 @@ davinci_picto MACH_DAVINCI_PICTO DAVINC
+ mecha MACH_MECHA MECHA 2892
+ bubba3 MACH_BUBBA3 BUBBA3 2893
+ pupitre MACH_PUPITRE PUPITRE 2894
+-tegra_harmony MACH_TEGRA_HARMONY TEGRA_HARMONY 2895
+ tegra_vogue MACH_TEGRA_VOGUE TEGRA_VOGUE 2896
+ tegra_e1165 MACH_TEGRA_E1165 TEGRA_E1165 2897
+ simplenet MACH_SIMPLENET SIMPLENET 2898
+@@ -2969,7 +2952,6 @@ netspace_lite_v2 MACH_NETSPACE_LITE_V2 N
+ ssc MACH_SSC SSC 2984
+ premierwave_en MACH_PREMIERWAVE_EN PREMIERWAVE_EN 2985
+ wasabi MACH_WASABI WASABI 2986
+-vivow MACH_VIVOW VIVOW 2987
+ mx50_rdp MACH_MX50_RDP MX50_RDP 2988
+ universal_c210 MACH_UNIVERSAL_C210 UNIVERSAL_C210 2989
+ real6410 MACH_REAL6410 REAL6410 2990
+@@ -3017,12 +2999,10 @@ remus MACH_REMUS REMUS 3031
+ at91cap7xdk MACH_AT91CAP7XDK AT91CAP7XDK 3032
+ at91cap7stk MACH_AT91CAP7STK AT91CAP7STK 3033
+ kt_sbc_sam9_1 MACH_KT_SBC_SAM9_1 KT_SBC_SAM9_1 3034
+-oratisrouter MACH_ORATISROUTER ORATISROUTER 3035
+ armada_xp_db MACH_ARMADA_XP_DB ARMADA_XP_DB 3036
+ spdm MACH_SPDM SPDM 3037
+ gtib MACH_GTIB GTIB 3038
+ dgm3240 MACH_DGM3240 DGM3240 3039
+-atlas_i_lpe MACH_ATLAS_I_LPE ATLAS_I_LPE 3040
+ htcmega MACH_HTCMEGA HTCMEGA 3041
+ tricorder MACH_TRICORDER TRICORDER 3042
+ tx28 MACH_TX28 TX28 3043
+@@ -3062,7 +3042,6 @@ clod MACH_CLOD CLOD 3077
+ rump MACH_RUMP RUMP 3078
+ tenderloin MACH_TENDERLOIN TENDERLOIN 3079
+ shortloin MACH_SHORTLOIN SHORTLOIN 3080
+-crespo MACH_CRESPO CRESPO 3081
+ antares MACH_ANTARES ANTARES 3082
+ wb40n MACH_WB40N WB40N 3083
+ herring MACH_HERRING HERRING 3084
+@@ -3109,9 +3088,7 @@ msm8x60_fluid MACH_MSM8X60_FLUID MSM8X6
+ smartqv5 MACH_SMARTQV5 SMARTQV5 3125
+ smartqv3 MACH_SMARTQV3 SMARTQV3 3126
+ smartqv7 MACH_SMARTQV7 SMARTQV7 3127
+-paz00 MACH_PAZ00 PAZ00 3128
+ acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129
+-htcwillow MACH_HTCWILLOW HTCWILLOW 3130
+ fwbd_0404 MACH_FWBD_0404 FWBD_0404 3131
+ hdgu MACH_HDGU HDGU 3132
+ pyramid MACH_PYRAMID PYRAMID 3133
+@@ -3162,7 +3139,6 @@ b5500 MACH_B5500 B5500 3177
+ s5500 MACH_S5500 S5500 3178
+ icon MACH_ICON ICON 3179
+ elephant MACH_ELEPHANT ELEPHANT 3180
+-msm8x60_fusion MACH_MSM8X60_FUSION MSM8X60_FUSION 3181
+ shooter MACH_SHOOTER SHOOTER 3182
+ spade_lte MACH_SPADE_LTE SPADE_LTE 3183
+ philhwani MACH_PHILHWANI PHILHWANI 3184
+@@ -3174,13 +3150,11 @@ ag5evm MACH_AG5EVM AG5EVM 3189
+ sc575plc MACH_SC575PLC SC575PLC 3190
+ sc575hmi MACH_SC575IPC SC575IPC 3191
+ omap3_tdm3730 MACH_OMAP3_TDM3730 OMAP3_TDM3730 3192
+-g7 MACH_G7 G7 3193
+ top9000_eval MACH_TOP9000_EVAL TOP9000_EVAL 3194
+ top9000_su MACH_TOP9000_SU TOP9000_SU 3195
+ utm300 MACH_UTM300 UTM300 3196
+ tsunagi MACH_TSUNAGI TSUNAGI 3197
+ ts75xx MACH_TS75XX TS75XX 3198
+-msm8x60_fusn_ffa MACH_MSM8X60_FUSN_FFA MSM8X60_FUSN_FFA 3199
+ ts47xx MACH_TS47XX TS47XX 3200
+ da850_k5 MACH_DA850_K5 DA850_K5 3201
+ ax502 MACH_AX502 AX502 3202
+@@ -3316,3 +3290,51 @@ rover_g8 MACH_ROVER_G8 ROVER_G8 3335
+ t5388p MACH_T5388P T5388P 3336
+ dingo MACH_DINGO DINGO 3337
+ goflexhome MACH_GOFLEXHOME GOFLEXHOME 3338
++lanreadyfn511 MACH_LANREADYFN511 LANREADYFN511 3340
++omap3_baia MACH_OMAP3_BAIA OMAP3_BAIA 3341
++omap3smartdisplay MACH_OMAP3SMARTDISPLAY OMAP3SMARTDISPLAY 3342
++xilinx MACH_XILINX XILINX 3343
++a2f MACH_A2F A2F 3344
++sky25 MACH_SKY25 SKY25 3345
++ccmx53 MACH_CCMX53 CCMX53 3346
++ccmx53js MACH_CCMX53JS CCMX53JS 3347
++ccwmx53 MACH_CCWMX53 CCWMX53 3348
++ccwmx53js MACH_CCWMX53JS CCWMX53JS 3349
++frisms MACH_FRISMS FRISMS 3350
++msm7x27a_ffa MACH_MSM7X27A_FFA MSM7X27A_FFA 3351
++msm7x27a_surf MACH_MSM7X27A_SURF MSM7X27A_SURF 3352
++msm7x27a_rumi3 MACH_MSM7X27A_RUMI3 MSM7X27A_RUMI3 3353
++dimmsam9g20 MACH_DIMMSAM9G20 DIMMSAM9G20 3354
++dimm_imx28 MACH_DIMM_IMX28 DIMM_IMX28 3355
++amk_a4 MACH_AMK_A4 AMK_A4 3356
++gnet_sgme MACH_GNET_SGME GNET_SGME 3357
++shooter_u MACH_SHOOTER_U SHOOTER_U 3358
++vmx53 MACH_VMX53 VMX53 3359
++rhino MACH_RHINO RHINO 3360
++armlex4210 MACH_ARMLEX4210 ARMLEX4210 3361
++swarcoextmodem MACH_SWARCOEXTMODEM SWARCOEXTMODEM 3362
++snowball MACH_SNOWBALL SNOWBALL 3363
++pcm049 MACH_PCM049 PCM049 3364
++vigor MACH_VIGOR VIGOR 3365
++oslo_amundsen MACH_OSLO_AMUNDSEN OSLO_AMUNDSEN 3366
++gsl_diamond MACH_GSL_DIAMOND GSL_DIAMOND 3367
++cv2201 MACH_CV2201 CV2201 3368
++cv2202 MACH_CV2202 CV2202 3369
++cv2203 MACH_CV2203 CV2203 3370
++vit_ibox MACH_VIT_IBOX VIT_IBOX 3371
++dm6441_esp MACH_DM6441_ESP DM6441_ESP 3372
++at91sam9x5ek MACH_AT91SAM9X5EK AT91SAM9X5EK 3373
++libra MACH_LIBRA LIBRA 3374
++easycrrh MACH_EASYCRRH EASYCRRH 3375
++tripel MACH_TRIPEL TRIPEL 3376
++endian_mini MACH_ENDIAN_MINI ENDIAN_MINI 3377
++xilinx_ep107 MACH_XILINX_EP107 XILINX_EP107 3378
++nuri MACH_NURI NURI 3379
++janus MACH_JANUS JANUS 3380
++ddnas MACH_DDNAS DDNAS 3381
++tag MACH_TAG TAG 3382
++tagw MACH_TAGW TAGW 3383
++nitrogen_vm_imx51 MACH_NITROGEN_VM_IMX51 NITROGEN_VM_IMX51 3384
++viprinet MACH_VIPRINET VIPRINET 3385
++bockw MACH_BOCKW BOCKW 3386
++eva2000 MACH_EVA2000 EVA2000 3387