[kernel] r16312 - in dists/sid/linux-2.6/debian: . config/armel patches/features/arm patches/series

Martin Michlmayr tbm at alioth.debian.org
Sat Sep 18 22:09:45 UTC 2010


Author: tbm
Date: Sat Sep 18 22:09:38 2010
New Revision: 16312

Log:
actually enable DOCKSTAR

Added:
   dists/sid/linux-2.6/debian/patches/features/arm/mach-types-update-2010-09-09.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/armel/config.kirkwood
   dists/sid/linux-2.6/debian/patches/series/24

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Sep 18 17:55:28 2010	(r16311)
+++ dists/sid/linux-2.6/debian/changelog	Sat Sep 18 22:09:38 2010	(r16312)
@@ -4,6 +4,10 @@
   * speakup: Update to match Debian package version 3.1.5.dfsg.1-1
   * scsi_dh_emc: Fix mode select request setup (Closes: #591540)
 
+  [ Martin Michlmayr ]
+  * ARM: update mach types.
+  * [armel/config.kirkwood] Enable MACH_DOCKSTAR.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 18 Sep 2010 17:29:34 +0100
 
 linux-2.6 (2.6.32-23) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Sat Sep 18 17:55:28 2010	(r16311)
+++ dists/sid/linux-2.6/debian/config/armel/config.kirkwood	Sat Sep 18 22:09:38 2010	(r16312)
@@ -63,6 +63,7 @@
 CONFIG_MACH_GURUPLUG=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
+CONFIG_MACH_DOCKSTAR=y
 CONFIG_MACH_OPENRD_BASE=y
 CONFIG_MACH_OPENRD_CLIENT=y
 CONFIG_MACH_OPENRD_ULTIMATE=y

Added: dists/sid/linux-2.6/debian/patches/features/arm/mach-types-update-2010-09-09.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/arm/mach-types-update-2010-09-09.patch	Sat Sep 18 22:09:38 2010	(r16312)
@@ -0,0 +1,272 @@
+--- a/arch/arm/tools/mach-types	2010-09-18 16:04:17.000000000 -0600
++++ b/arch/arm/tools/mach-types	2010-09-18 16:05:28.000000000 -0600
+@@ -12,7 +12,7 @@
+ #
+ #   http://www.arm.linux.org.uk/developer/machines/?action=new
+ #
+-# Last update: Sun Jun 13 12:08:01 2010
++# Last update: Thu Sep 9 22:43:01 2010
+ #
+ # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number
+ #
+@@ -1319,7 +1319,7 @@
+ msm			MACH_MSM		MSM			1316
+ ct5910			MACH_CT5910		CT5910			1317
+ ct5912			MACH_CT5912		CT5912			1318
+-argonst_foundation	MACH_HYNET_INE		HYNET_INE		1319
++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 +1777,7 @@
+ sg560adsl		MACH_SG560ADSL		SG560ADSL		1786
+ nextio_n2800_ica	MACH_NEXTIO_N2800_ICA	NEXTIO_N2800_ICA	1787
+ dove_db			MACH_DOVE_DB		DOVE_DB			1788
+-dove_avng		MACH_MARVELL_NEWDB	MARVELL_NEWDB		1789
++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
+@@ -1994,7 +1994,7 @@
+ benzina			MACH_BENZINA		BENZINA			2003
+ blaze			MACH_BLAZE		BLAZE			2004
+ linkstation_ls_hgl	MACH_LINKSTATION_LS_HGL	LINKSTATION_LS_HGL	2005
+-htckovsky		MACH_HTCVENUS		HTCVENUS		2006
++htckovsky		MACH_HTCKOVSKY		HTCKOVSKY		2006
+ sony_prs505		MACH_SONY_PRS505	SONY_PRS505		2007
+ hanlin_v3		MACH_HANLIN_V3		HANLIN_V3		2008
+ sapphira		MACH_SAPPHIRA		SAPPHIRA		2009
+@@ -2308,7 +2308,7 @@
+ tazkiosk		MACH_TAZKIOSK		TAZKIOSK		2320
+ whiterabbit_mch		MACH_WHITERABBIT_MCH	WHITERABBIT_MCH		2321
+ sbox9263		MACH_SBOX9263		SBOX9263		2322
+-oreo_camera		MACH_OREO		OREO			2323
++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 +2374,7 @@
+ rbl01			MACH_RBL01		RBL01			2387
+ omnifi			MACH_OMNIFI		OMNIFI			2388
+ otavalo			MACH_OTAVALO		OTAVALO			2389
+-siena			MACH_SIENNA		SIENNA			2390
++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
+@@ -2498,7 +2498,7 @@
+ phy3250			MACH_PHY3250		PHY3250			2511
+ ea3250			MACH_EA3250		EA3250			2512
+ fdi3250			MACH_FDI3250		FDI3250			2513
+-htcwhitestone		MACH_WHITESTONE		WHITESTONE		2514
++whitestone		MACH_WHITESTONE		WHITESTONE		2514
+ at91sam9263nit		MACH_AT91SAM9263NIT	AT91SAM9263NIT		2515
+ ccmx51			MACH_CCMX51		CCMX51			2516
+ ccmx51js		MACH_CCMX51JS		CCMX51JS		2517
+@@ -2582,7 +2582,7 @@
+ pca101			MACH_PCA101		PCA101			2595
+ buzzc			MACH_BUZZC		BUZZC			2596
+ sasie2			MACH_SASIE2		SASIE2			2597
+-davinci_dm6467_cio	MACH_DAVINCI_CIO	DAVINCI_CIO		2598
++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
+@@ -2609,7 +2609,7 @@
+ lexikon			MACH_LEXIKON		LEXIKON			2622
+ mini2440v2		MACH_MINI2440V2		MINI2440V2		2623
+ icontrol		MACH_ICONTROL		ICONTROL		2624
+-sheevad			MACH_SHEEVAD		SHEEVAD			2625
++gplugd			MACH_SHEEVAD		SHEEVAD			2625
+ qsd8x50a_st1_1		MACH_QSD8X50A_ST1_1	QSD8X50A_ST1_1		2626
+ qsd8x50a_st1_5		MACH_QSD8X50A_ST1_5	QSD8X50A_ST1_5		2627
+ bee			MACH_BEE		BEE			2628
+@@ -2622,7 +2622,7 @@
+ gw2388			MACH_GW2388		GW2388			2635
+ jadecpu			MACH_JADECPU		JADECPU			2636
+ carlisle		MACH_CARLISLE		CARLISLE		2637
+-lux_sf9			MACH_LUX_SFT9		LUX_SFT9		2638
++lux_sf9			MACH_LUX_SF9		LUX_SF9			2638
+ nemid_tb		MACH_NEMID_TB		NEMID_TB		2639
+ terrier			MACH_TERRIER		TERRIER			2640
+ turbot			MACH_TURBOT		TURBOT			2641
+@@ -2750,7 +2750,7 @@
+ smint01			MACH_SMINT01		SMINT01			2763
+ prtlvt2			MACH_PRTLVT2		PRTLVT2			2764
+ ap420			MACH_AP420		AP420			2765
+-htcclio			MACH_HTCSHIFT		HTCSHIFT		2766
++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 +2761,7 @@
+ kopin_models		MACH_KOPIN_MODELS	KOPIN_MODELS		2774
+ ttc_vision2		MACH_TTC_VISION2	TTC_VISION2		2775
+ cns3420vb		MACH_CNS3420VB		CNS3420VB		2776
+-lpc_evo			MACH_LPC2		LPC2			2777
++lpc2			MACH_LPC2		LPC2			2777
+ olympus			MACH_OLYMPUS		OLYMPUS			2778
+ vortex			MACH_VORTEX		VORTEX			2779
+ s5pc200			MACH_S5PC200		S5PC200			2780
+@@ -2788,7 +2788,7 @@
+ neocoreomap		MACH_NEOCOREOMAP	NEOCOREOMAP		2801
+ withings_wbp		MACH_WITHINGS_WBP	WITHINGS_WBP		2802
+ dbps			MACH_DBPS		DBPS			2803
+-at91sam9261		MACH_SBC9261		SBC9261			2804
++sbc9261			MACH_SBC9261		SBC9261			2804
+ pcbfp0001		MACH_PCBFP0001		PCBFP0001		2805
+ speedy			MACH_SPEEDY		SPEEDY			2806
+ chrysaor		MACH_CHRYSAOR		CHRYSAOR		2807
+@@ -2896,5 +2896,151 @@
+ 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
++atlas5_c1		MACH_ATLAS5_C1		ATLAS5_C1		2916
++nsb3ast			MACH_NSB3AST		NSB3AST			2917
++gnet_slc		MACH_GNET_SLC		GNET_SLC		2918
++af4000			MACH_AF4000		AF4000			2919
++ark9431			MACH_ARK9431		ARK9431			2920
++fs_s5pc100		MACH_FS_S5PC100		FS_S5PC100		2921
++omap3505nova8		MACH_OMAP3505NOVA8	OMAP3505NOVA8		2922
++omap3621_edp1		MACH_OMAP3621_EDP1	OMAP3621_EDP1		2923
++oratisaes		MACH_ORATISAES		ORATISAES		2924
++smdkv310		MACH_SMDKV310		SMDKV310		2925
++siemens_l0		MACH_SIEMENS_L0		SIEMENS_L0		2926
++ventana			MACH_VENTANA		VENTANA			2927
++wm8505_7in_netbook	MACH_WM8505_7IN_NETBOOK	WM8505_7IN_NETBOOK	2928
++ec4350sdb		MACH_EC4350SDB		EC4350SDB		2929
++mimas			MACH_MIMAS		MIMAS			2930
++titan			MACH_TITAN		TITAN			2931
++craneboard		MACH_CRANEBOARD		CRANEBOARD		2932
++es2440			MACH_ES2440		ES2440			2933
++najay_a9263		MACH_NAJAY_A9263	NAJAY_A9263		2934
++htctornado		MACH_HTCTORNADO		HTCTORNADO		2935
++dimm_mx257		MACH_DIMM_MX257		DIMM_MX257		2936
++jigen301		MACH_JIGEN		JIGEN			2937
++smdk6450		MACH_SMDK6450		SMDK6450		2938
++meno_qng		MACH_MENO_QNG		MENO_QNG		2939
++ns2416			MACH_NS2416		NS2416			2940
++rpc353			MACH_RPC353		RPC353			2941
++tq6410			MACH_TQ6410		TQ6410			2942
++sky6410			MACH_SKY6410		SKY6410			2943
++dynasty			MACH_DYNASTY		DYNASTY			2944
++vivo			MACH_VIVO		VIVO			2945
++bury_bl7582		MACH_BURY_BL7582	BURY_BL7582		2946
++bury_bps5270		MACH_BURY_BPS5270	BURY_BPS5270		2947
++basi			MACH_BASI		BASI			2948
++tn200			MACH_TN200		TN200			2949
++c2mmi			MACH_C2MMI		C2MMI			2950
++meson_6236m		MACH_MESON_6236M	MESON_6236M		2951
++meson_8626m		MACH_MESON_8626M	MESON_8626M		2952
++tube			MACH_TUBE		TUBE			2953
++messina			MACH_MESSINA		MESSINA			2954
++mx50_arm2		MACH_MX50_ARM2		MX50_ARM2		2955
++cetus9263		MACH_CETUS9263		CETUS9263		2956
++brownstone		MACH_BROWNSTONE		BROWNSTONE		2957
++vmx25			MACH_VMX25		VMX25			2958
++vmx51			MACH_VMX51		VMX51			2959
++abacus			MACH_ABACUS		ABACUS			2960
++cm4745			MACH_CM4745		CM4745			2961
++oratislink		MACH_ORATISLINK		ORATISLINK		2962
++davinci_dm365_dvr	MACH_DAVINCI_DM365_DVR	DAVINCI_DM365_DVR	2963
++netviz			MACH_NETVIZ		NETVIZ			2964
++flexibity		MACH_FLEXIBITY		FLEXIBITY		2965
++wlan_computer		MACH_WLAN_COMPUTER	WLAN_COMPUTER		2966
++lpc24xx			MACH_LPC24XX		LPC24XX			2967
++spica			MACH_SPICA		SPICA			2968
++gpsdisplay		MACH_GPSDISPLAY		GPSDISPLAY		2969
++bipnet			MACH_BIPNET		BIPNET			2970
++overo_ctu_inertial	MACH_OVERO_CTU_INERTIAL	OVERO_CTU_INERTIAL	2971
++davinci_dm355_mmm	MACH_DAVINCI_DM355_MMM	DAVINCI_DM355_MMM	2972
++pc9260_v2		MACH_PC9260_V2		PC9260_V2		2973
++ptx7545			MACH_PTX7545		PTX7545			2974
++tm_efdc			MACH_TM_EFDC		TM_EFDC			2975
++omap3_waldo1		MACH_OMAP3_WALDO1	OMAP3_WALDO1		2977
++flyer			MACH_FLYER		FLYER			2978
++tornado3240		MACH_TORNADO3240	TORNADO3240		2979
++soli_01			MACH_SOLI_01		SOLI_01			2980
++omapl138_europalc	MACH_OMAPL138_EUROPALC	OMAPL138_EUROPALC	2981
++helios_v1		MACH_HELIOS_V1		HELIOS_V1		2982
++netspace_lite_v2	MACH_NETSPACE_LITE_V2	NETSPACE_LITE_V2	2983
++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		MACH_UNIVERSAL		UNIVERSAL		2989
++real6410		MACH_REAL6410		REAL6410		2990
++spx_sakura		MACH_SPX_SAKURA		SPX_SAKURA		2991
++ij3k_2440		MACH_IJ3K_2440		IJ3K_2440		2992
++omap3_bc10		MACH_OMAP3_BC10		OMAP3_BC10		2993
++thebe			MACH_THEBE		THEBE			2994
++rv082			MACH_RV082		RV082			2995
++armlguest		MACH_ARMLGUEST		ARMLGUEST		2996
++tjinc1000		MACH_TJINC1000		TJINC1000		2997
++dockstar		MACH_DOCKSTAR		DOCKSTAR		2998
++ax8008			MACH_AX8008		AX8008			2999
++gnet_sgce		MACH_GNET_SGCE		GNET_SGCE		3000
++pxwnas_500_1000		MACH_PXWNAS_500_1000	PXWNAS_500_1000		3001
++ea20			MACH_EA20		EA20			3002
++awm2			MACH_AWM2		AWM2			3003
++ti8148evm		MACH_TI8148EVM		TI8148EVM		3004
++tegra_seaboard		MACH_TEGRA_SEABOARD	TEGRA_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
++aquarius		MACH_AQUARIUS		AQUARIUS		3009
++mx53_ard		MACH_MX53_ARD		MX53_ARD		3010
++mx53_smd		MACH_MX53_SMD		MX53_SMD		3011
++lswxl			MACH_LSWXL		LSWXL			3012
++dove_avng_v3		MACH_DOVE_AVNG_V3	DOVE_AVNG_V3		3013
++sdi_ess_9263		MACH_SDI_ESS_9263	SDI_ESS_9263		3014
++jocpu550		MACH_JOCPU550		JOCPU550		3015
++msm8x60_rumi3		MACH_MSM8X60_RUMI3	MSM8X60_RUMI3		3016
++msm8x60_ffa		MACH_MSM8X60_FFA	MSM8X60_FFA		3017
++yanomami		MACH_YANOMAMI		YANOMAMI		3018
++gta04			MACH_GTA04		GTA04			3019
++cm_a510			MACH_CM_A510		CM_A510			3020
++omap3_rfs200		MACH_OMAP3_RFS200	OMAP3_RFS200		3021
++kx33xx			MACH_KX33XX		KX33XX			3022
++ptx7510			MACH_PTX7510		PTX7510			3023
++top9000			MACH_TOP9000		TOP9000			3024
++teenote			MACH_TEENOTE		TEENOTE			3025
++ts3			MACH_TS3		TS3			3026
++a0			MACH_A0			A0			3027
++fsm9xxx_surf		MACH_FSM9XXX_SURF	FSM9XXX_SURF		3028
++fsm9xxx_ffa		MACH_FSM9XXX_FFA	FSM9XXX_FFA		3029
++frrhwcdma60w		MACH_FRRHWCDMA60W	FRRHWCDMA60W		3030
++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
++bstbrd			MACH_BSTBRD		BSTBRD			3044
++pwb3090			MACH_PWB3090		PWB3090			3045
++idea6410		MACH_IDEA6410		IDEA6410		3046
++qbc9263			MACH_QBC9263		QBC9263			3047
++borabora		MACH_BORABORA		BORABORA		3048
++valdez			MACH_VALDEZ		VALDEZ			3049
++ls9g20			MACH_LS9G20		LS9G20			3050
++mios_v1			MACH_MIOS_V1		MIOS_V1			3051
++s5pc110_crespo		MACH_S5PC110_CRESPO	S5PC110_CRESPO		3052
++controltek9g20		MACH_CONTROLTEK9G20	CONTROLTEK9G20		3053
++tin307			MACH_TIN307		TIN307			3054
++tin510			MACH_TIN510		TIN510			3055
++bluecheese		MACH_BLUECHEESE		BLUECHEESE		3057
++tem3x30			MACH_TEM3X30		TEM3X30			3058
++harvest_desoto		MACH_HARVEST_DESOTO	HARVEST_DESOTO		3059
++msm8x60_qrdc		MACH_MSM8X60_QRDC	MSM8X60_QRDC		3060
++spear900		MACH_SPEAR900		SPEAR900		3061
++pcontrol_g20		MACH_PCONTROL_G20	PCONTROL_G20		3062

Modified: dists/sid/linux-2.6/debian/patches/series/24
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/24	Sat Sep 18 17:55:28 2010	(r16311)
+++ dists/sid/linux-2.6/debian/patches/series/24	Sat Sep 18 22:09:38 2010	(r16312)
@@ -1,3 +1,4 @@
 + features/all/speakup/speakup-3.1.5.dfsg.1-1.patch
 + bugfix/all/SCSI-scsi_dh_emc-fix-mode-select-request-setup.patch
 + bugfix/all/SCSI-scsi_dh_emc-request-flag-cleanup.patch
++ features/arm/mach-types-update-2010-09-09.patch



More information about the Kernel-svn-changes mailing list