Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.40 · b06c16dc32 - Gogs

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.40

Mark Brown 14 years ago

parent

af46800b9a 87023ff74b

commit

b06c16dc32

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
include/sound/soc.h
							 
								View File
							
				@@ -820,7 +820,7 @@ struct soc_enum {
			
				 	unsigned char shift_r;
			
				 	unsigned int max;
			
				 	unsigned int mask;
			
				-	const char **texts;
			
				+	const char * const *texts;
			
				 	const unsigned int *values;
			
				 	void *dapm;
			
				 };