diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-03 18:28:51 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-03 18:28:51 -0400 |
| commit | b06c16dc3252018d0cad8fbd026cb9d65af31a4a (patch) | |
| tree | d5e0a405d8bc904fe90cc220b740c6a525f37d82 /include/sound/soc.h | |
| 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
Diffstat (limited to 'include/sound/soc.h')
| -rw-r--r-- | include/sound/soc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 6ce3e573fb40..b27c7a2d3bb0 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
| @@ -820,7 +820,7 @@ struct soc_enum { | |||
| 820 | unsigned char shift_r; | 820 | unsigned char shift_r; |
| 821 | unsigned int max; | 821 | unsigned int max; |
| 822 | unsigned int mask; | 822 | unsigned int mask; |
| 823 | const char **texts; | 823 | const char * const *texts; |
| 824 | const unsigned int *values; | 824 | const unsigned int *values; |
| 825 | void *dapm; | 825 | void *dapm; |
| 826 | }; | 826 | }; |