| commit | b06c16dc3252018d0cad8fbd026cb9d65af31a4a | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue May 03 23:28:51 2011 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue May 03 23:28:51 2011 +0100 |
| tree | d5e0a405d8bc904fe90cc220b740c6a525f37d82 | |
| parent | af46800b9a3947724baeffb1a1649276971297c7 [diff] | |
| parent | 87023ff74b2358b5e51d3c790704f786e89ff769 [diff] |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.40
diff --git a/include/sound/soc.h b/include/sound/soc.h index 6ce3e57..b27c7a2 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h
@@ -820,7 +820,7 @@ unsigned char shift_r; unsigned int max; unsigned int mask; - const char **texts; + const char * const *texts; const unsigned int *values; void *dapm; };