summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-04 02:28:51 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-04 02:28:51 +0400
commitb06c16dc3252018d0cad8fbd026cb9d65af31a4a (patch)
treed5e0a405d8bc904fe90cc220b740c6a525f37d82 /include/sound
parentaf46800b9a3947724baeffb1a1649276971297c7 (diff)
parent87023ff74b2358b5e51d3c790704f786e89ff769 (diff)
downloadlinux-b06c16dc3252018d0cad8fbd026cb9d65af31a4a.tar.xz
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')
-rw-r--r--include/sound/soc.h2
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 {
unsigned char shift_r;
unsigned int max;
unsigned int mask;
- const char **texts;
+ const char * const *texts;
const unsigned int *values;
void *dapm;
};