summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-23 23:44:59 +0000
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-23 23:44:59 +0000
commitf3c50cd7965f29d488b78df9488327d1b193b58a (patch)
treebaf4fa8e5bcaaf51811b5a8d0450dfe2803bf093
parente593f00fc1336aa9e68e7758a48062ae186eaa01 (diff)
2.6.38: Remove patches that are upstream in -rc6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25680 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/patches-2.6.38/040-arm-update-mach-types.patch389
-rw-r--r--target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch14
2 files changed, 0 insertions, 403 deletions
diff --git a/target/linux/generic/patches-2.6.38/040-arm-update-mach-types.patch b/target/linux/generic/patches-2.6.38/040-arm-update-mach-types.patch
deleted file mode 100644
index f8ba59bb0..000000000
--- a/target/linux/generic/patches-2.6.38/040-arm-update-mach-types.patch
+++ /dev/null
@@ -1,389 +0,0 @@
---- 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: Sun Dec 12 23:24:27 2010
-+# Last update: Wed Feb 2 23:10:43 2011
- #
- # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
- #
-@@ -1319,7 +1319,7 @@ 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
-+argonst_mp 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 +1777,7 @@ 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
-+dove_avng 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 +1877,7 @@ 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
-+p87_fpga MACH_SST61VC010_FPGA SST61VC010_FPGA 1889
- kixvp435 MACH_KIXVP435 KIXVP435 1890
- kixnp435 MACH_KIXNP435 KIXNP435 1891
- africa MACH_AFRICA AFRICA 1892
-@@ -2240,7 +2240,7 @@ arm_ultimator2 MACH_ARM_ULTIMATOR2 ARM_
- vs_v210 MACH_VS_V210 VS_V210 2252
- vs_v212 MACH_VS_V212 VS_V212 2253
- hmt MACH_HMT HMT 2254
--suen3 MACH_SUEN3 SUEN3 2255
-+km_kirkwood MACH_KM_KIRKWOOD KM_KIRKWOOD 2255
- vesper MACH_VESPER VESPER 2256
- str9 MACH_STR9 STR9 2257
- omap3_wl_ff MACH_OMAP3_WL_FF OMAP3_WL_FF 2258
-@@ -2308,7 +2308,7 @@ 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
-+oreo_camera MACH_OREO OREO 2323
- smdk6442 MACH_SMDK6442 SMDK6442 2324
- openrd_base MACH_OPENRD_BASE OPENRD_BASE 2325
- incredible MACH_INCREDIBLE INCREDIBLE 2326
-@@ -2374,7 +2374,7 @@ 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
-+siena 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 +2446,7 @@ 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
-+p87_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 +2498,7 @@ 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
-+htcwhitestone MACH_WHITESTONE WHITESTONE 2514
- at91sam9263nit MACH_AT91SAM9263NIT AT91SAM9263NIT 2515
- ccmx51 MACH_CCMX51 CCMX51 2516
- ccmx51js MACH_CCMX51JS CCMX51JS 2517
-@@ -2561,7 +2561,7 @@ 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_gx2 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 +2582,7 @@ 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
-+davinci_dm6467_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 +2591,7 @@ 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
-+mydev MACH_CYBO2440 CYBO2440 2607
- vdssw MACH_VDSSW VDSSW 2608
- romulus MACH_ROMULUS ROMULUS 2609
- omap_magic MACH_OMAP_MAGIC OMAP_MAGIC 2610
-@@ -2683,7 +2683,7 @@ 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
-+catania_s 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 +2741,7 @@ 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
-+cvc600 MACH_VMC300 VMC300 2757
- tcc8000_sdk MACH_TCC8000_SDK TCC8000_SDK 2758
- nanos MACH_NANOS NANOS 2759
- stamp9g10 MACH_STAMP9G10 STAMP9G10 2760
-@@ -2750,7 +2750,7 @@ 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
-+htcclio 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 +2761,7 @@ 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
-+lpc_evo MACH_LPC2 LPC2 2777
- olympus MACH_OLYMPUS OLYMPUS 2778
- vortex MACH_VORTEX VORTEX 2779
- s5pc200 MACH_S5PC200 S5PC200 2780
-@@ -2788,7 +2788,7 @@ 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
-+at91sam9261 MACH_SBC9261 SBC9261 2804
- pcbfp0001 MACH_PCBFP0001 PCBFP0001 2805
- speedy MACH_SPEEDY SPEEDY 2806
- chrysaor MACH_CHRYSAOR CHRYSAOR 2807
-@@ -2812,7 +2812,7 @@ 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
-+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 +2879,7 @@ 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_unused 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
-@@ -2896,6 +2896,7 @@ e10 MACH_E10 E10 2908
- app3k_robin MACH_APP3K_ROBIN APP3K_ROBIN 2909
- pov15hd MACH_POV15HD POV15HD 2910
- stella MACH_STELLA STELLA 2911
-+htc_iolite MACH_MACH_HTC_IOLITE MACH_HTC_IOLITE 2912
- linkstation_lschl MACH_LINKSTATION_LSCHL LINKSTATION_LSCHL 2913
- netwalker MACH_NETWALKER NETWALKER 2914
- acsx106 MACH_ACSX106 ACSX106 2915
-@@ -2959,6 +2960,7 @@ davinci_dm355_mmm MACH_DAVINCI_DM355_MMM
- pc9260_v2 MACH_PC9260_V2 PC9260_V2 2973
- ptx7545 MACH_PTX7545 PTX7545 2974
- tm_efdc MACH_TM_EFDC TM_EFDC 2975
-+remove_me MACH_WALDO1 WALDO1 2976
- omap3_waldo1 MACH_OMAP3_WALDO1 OMAP3_WALDO1 2977
- flyer MACH_FLYER FLYER 2978
- tornado3240 MACH_TORNADO3240 TORNADO3240 2979
-@@ -2969,7 +2971,7 @@ 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
-+vivo_w 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
-@@ -2987,7 +2989,7 @@ pxwnas_500_1000 MACH_PXWNAS_500_1000 PX
- ea20 MACH_EA20 EA20 3002
- awm2 MACH_AWM2 AWM2 3003
- ti8148evm MACH_TI8148EVM TI8148EVM 3004
--tegra_seaboard MACH_TEGRA_SEABOARD TEGRA_SEABOARD 3005
-+seaboard MACH_SEABOARD SEABOARD 3005
- linkstation_chlv2 MACH_LINKSTATION_CHLV2 LINKSTATION_CHLV2 3006
- tera_pro2_rack MACH_TERA_PRO2_RACK TERA_PRO2_RACK 3007
- rubys MACH_RUBYS RUBYS 3008
-@@ -3017,12 +3019,12 @@ 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
-+at91sam9263router 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
-+iv_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
-@@ -3038,6 +3040,7 @@ s5pc110_crespo MACH_S5PC110_CRESPO S5PC
- controltek9g20 MACH_CONTROLTEK9G20 CONTROLTEK9G20 3053
- tin307 MACH_TIN307 TIN307 3054
- tin510 MACH_TIN510 TIN510 3055
-+ep3505 MACH_EP3517 EP3517 3056
- bluecheese MACH_BLUECHEESE BLUECHEESE 3057
- tem3x30 MACH_TEM3X30 TEM3X30 3058
- harvest_desoto MACH_HARVEST_DESOTO HARVEST_DESOTO 3059
-@@ -3062,7 +3065,7 @@ 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
-+roml1 MACH_CRESPO CRESPO 3081
- antares MACH_ANTARES ANTARES 3082
- wb40n MACH_WB40N WB40N 3083
- herring MACH_HERRING HERRING 3084
-@@ -3109,9 +3112,9 @@ 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
-+tegra_paz00 MACH_PAZ00 PAZ00 3128
- acmenetusfoxg20 MACH_ACMENETUSFOXG20 ACMENETUSFOXG20 3129
--htcwillow MACH_HTCWILLOW HTCWILLOW 3130
-+htc_willow MACH_HTCWILLOW HTCWILLOW 3130
- fwbd_0404 MACH_FWBD_0404 FWBD_0404 3131
- hdgu MACH_HDGU HDGU 3132
- pyramid MACH_PYRAMID PYRAMID 3133
-@@ -3162,7 +3165,7 @@ 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
-+msm8x60_charm_surf 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 +3177,13 @@ 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
-+rover_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
-+msm8x60_charm_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
-@@ -3190,9 +3193,10 @@ synergy MACH_SYNERGY SYNERGY 3205
- ics_if_voip MACH_ICS_IF_VOIP ICS_IF_VOIP 3206
- wlf_cragg_6410 MACH_WLF_CRAGG_6410 WLF_CRAGG_6410 3207
- punica MACH_PUNICA PUNICA 3208
--sbc_nt250 MACH_SBC_NT250 SBC_NT250 3209
-+trimslice MACH_SBC_NT250 SBC_NT250 3209
- mx27_wmultra MACH_MX27_WMULTRA MX27_WMULTRA 3210
- mackerel MACH_MACKEREL MACKEREL 3211
-+pvd_imx27 MACH_MACH_PVD_IMX27 MACH_PVD_IMX27 3212
- fa9x27 MACH_FA9X27 FA9X27 3213
- ns2816tb MACH_NS2816TB NS2816TB 3214
- ns2816_ntpad MACH_NS2816_NTPAD NS2816_NTPAD 3215
-@@ -3219,3 +3223,100 @@ pivicc MACH_PIVICC PIVICC 3235
- pcm048 MACH_PCM048 PCM048 3236
- dds MACH_DDS DDS 3237
- chalten_xa1 MACH_CHALTEN_XA1 CHALTEN_XA1 3238
-+ts48xx MACH_TS48XX TS48XX 3239
-+tonga2_tfttimer MACH_TONGA2_TFTTIMER TONGA2_TFTTIMER 3240
-+whistler MACH_WHISTLER WHISTLER 3241
-+asl_phoenix MACH_ASL_PHOENIX ASL_PHOENIX 3242
-+at91sam9263otlite MACH_AT91SAM9263OTLITE AT91SAM9263OTLITE 3243
-+ddplug MACH_DDPLUG DDPLUG 3244
-+d2plug MACH_D2PLUG D2PLUG 3245
-+kzm9d MACH_KZM9D KZM9D 3246
-+verdi_lte MACH_VERDI_LTE VERDI_LTE 3247
-+nanozoom MACH_NANOZOOM NANOZOOM 3248
-+dm3730_som_lv MACH_DM3730_SOM_LV DM3730_SOM_LV 3249
-+dm3730_torpedo MACH_DM3730_TORPEDO DM3730_TORPEDO 3250
-+anchovy MACH_ANCHOVY ANCHOVY 3251
-+linux MACH_LINUX LINUX 3252
-+re2rev20 MACH_RE2REV20 RE2REV20 3253
-+re2rev21 MACH_RE2REV21 RE2REV21 3254
-+cns21xx MACH_CNS21XX CNS21XX 3255
-+rider MACH_RIDER RIDER 3257
-+nsk330 MACH_NSK330 NSK330 3258
-+cns2133evb MACH_CNS2133EVB CNS2133EVB 3259
-+z3_816x_mod MACH_Z3_816X_MOD Z3_816X_MOD 3260
-+z3_814x_mod MACH_Z3_814X_MOD Z3_814X_MOD 3261
-+beect MACH_BEECT BEECT 3262
-+dma_thunderbug MACH_DMA_THUNDERBUG DMA_THUNDERBUG 3263
-+omn_at91sam9g20 MACH_OMN_AT91SAM9G20 OMN_AT91SAM9G20 3264
-+mx25_e2s_uc MACH_MX25_E2S_UC MX25_E2S_UC 3265
-+mione MACH_MIONE MIONE 3266
-+top9000_tcu MACH_TOP9000_TCU TOP9000_TCU 3267
-+top9000_bsl MACH_TOP9000_BSL TOP9000_BSL 3268
-+kingdom MACH_KINGDOM KINGDOM 3269
-+armadillo460 MACH_ARMADILLO460 ARMADILLO460 3270
-+lq2 MACH_LQ2 LQ2 3271
-+sweda_tms2 MACH_SWEDA_TMS2 SWEDA_TMS2 3272
-+mx53_loco MACH_MX53_LOCO MX53_LOCO 3273
-+acer_a7 MACH_MACH_ACER_A7 MACH_ACER_A7 3274
-+acer_a8 MACH_ACER_A8 ACER_A8 3275
-+acer_gauguin MACH_ACER_GAUGUIN ACER_GAUGUIN 3276
-+guppy MACH_GUPPY GUPPY 3277
-+mx61_ard MACH_MX61_ARD MX61_ARD 3278
-+tx53 MACH_TX53 TX53 3279
-+omapl138_case_a3 MACH_OMAPL138_CASE_A3 OMAPL138_CASE_A3 3280
-+uemd MACH_UEMD UEMD 3281
-+ccwmx51mut MACH_CCWMX51MUT CCWMX51MUT 3282
-+rockhopper MACH_ROCKHOPPER ROCKHOPPER 3283
-+nookcolor MACH_NOOKCOLOR NOOKCOLOR 3284
-+hkdkc100 MACH_HKDKC100 HKDKC100 3285
-+ts42xx MACH_TS42XX TS42XX 3286
-+aebl MACH_AEBL AEBL 3287
-+wario MACH_WARIO WARIO 3288
-+gfs_spm MACH_GFS_SPM GFS_SPM 3289
-+cm_t3730 MACH_CM_T3730 CM_T3730 3290
-+isc3 MACH_ISC3 ISC3 3291
-+rascal MACH_RASCAL RASCAL 3292
-+hrefv60 MACH_HREFV60 HREFV60 3293
-+tpt_2_0 MACH_TPT_2_0 TPT_2_0 3294
-+pyramid_td MACH_PYRAMID_TD PYRAMID_TD 3295
-+splendor MACH_SPLENDOR SPLENDOR 3296
-+guf_planet MACH_GUF_PLANET GUF_PLANET 3297
-+msm8x60_qt MACH_MSM8X60_QT MSM8X60_QT 3298
-+htc_hd_mini MACH_HTC_HD_MINI HTC_HD_MINI 3299
-+athene MACH_ATHENE ATHENE 3300
-+deep_r_ek_1 MACH_DEEP_R_EK_1 DEEP_R_EK_1 3301
-+vivow_ct MACH_VIVOW_CT VIVOW_CT 3302
-+nery_1000 MACH_NERY_1000 NERY_1000 3303
-+rfl109145_ssrv MACH_RFL109145_SSRV RFL109145_SSRV 3304
-+nmh MACH_NMH NMH 3305
-+wn802t MACH_WN802T WN802T 3306
-+dragonet MACH_DRAGONET DRAGONET 3307
-+geneva_b MACH_GENEVA_B GENEVA_B 3308
-+at91sam9263desk16l MACH_AT91SAM9263DESK16L AT91SAM9263DESK16L 3309
-+bcmhana_sv MACH_BCMHANA_SV BCMHANA_SV 3310
-+bcmhana_tablet MACH_BCMHANA_TABLET BCMHANA_TABLET 3311
-+koi MACH_KOI KOI 3312
-+ts4800 MACH_TS4800 TS4800 3313
-+tqma9263 MACH_TQMA9263 TQMA9263 3314
-+holiday MACH_HOLIDAY HOLIDAY 3315
-+dma_6410 MACH_DMA6410 DMA6410 3316
-+pcats_overlay MACH_PCATS_OVERLAY PCATS_OVERLAY 3317
-+hwgw6410 MACH_HWGW6410 HWGW6410 3318
-+shenzhou MACH_SHENZHOU SHENZHOU 3319
-+cwme9210 MACH_CWME9210 CWME9210 3320
-+cwme9210js MACH_CWME9210JS CWME9210JS 3321
-+pgs_v1 MACH_PGS_SITARA PGS_SITARA 3322
-+colibri_tegra2 MACH_COLIBRI_TEGRA2 COLIBRI_TEGRA2 3323
-+w21 MACH_W21 W21 3324
-+polysat1 MACH_POLYSAT1 POLYSAT1 3325
-+dataway MACH_DATAWAY DATAWAY 3326
-+cobral138 MACH_COBRAL138 COBRAL138 3327
-+roverpcs8 MACH_ROVERPCS8 ROVERPCS8 3328
-+marvelc MACH_MARVELC MARVELC 3329
-+navefihid MACH_NAVEFIHID NAVEFIHID 3330
-+dm365_cv100 MACH_DM365_CV100 DM365_CV100 3331
-+able MACH_ABLE ABLE 3332
-+legacy MACH_LEGACY LEGACY 3333
-+icong MACH_ICONG ICONG 3334
-+rover_g8 MACH_ROVER_G8 ROVER_G8 3335
-+t5388p MACH_T5388P T5388P 3336
diff --git a/target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch b/target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch
deleted file mode 100644
index 13595725c..000000000
--- a/target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/drivers/atm/solos-pci.c
-+++ b/drivers/atm/solos-pci.c
-@@ -866,8 +866,9 @@ static int popen(struct atm_vcc *vcc)
- }
-
- skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
-- if (!skb && net_ratelimit()) {
-- dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
-+ if (!skb) {
-+ if (net_ratelimit())
-+ dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
- return -ENOMEM;
- }
- header = (void *)skb_put(skb, sizeof(*header));