Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b06c16dc authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/asoc' of... 

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

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

};