summaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-11 12:06:30 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-11 12:06:30 +0100
commitd289323286d6b4e738458c31533da51d294d28a0 (patch)
tree64a3869290395a9eaafacd26cf992278f4302f7b /include/sound/soc.h
parentMerge remote-tracking branch 'asoc/topic/compress' into asoc-next (diff)
parentASoC: core: Ensure SND_SOC_BYTES writes are from DMA safe memory (diff)
downloadlinux-d289323286d6b4e738458c31533da51d294d28a0.tar.xz
linux-d289323286d6b4e738458c31533da51d294d28a0.zip
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index bc56738cb109..c76d0242c2a8 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -906,8 +906,8 @@ struct snd_soc_dai_link {
struct snd_pcm_hw_params *params);
/* machine stream operations */
- struct snd_soc_ops *ops;
- struct snd_soc_compr_ops *compr_ops;
+ const struct snd_soc_ops *ops;
+ const struct snd_soc_compr_ops *compr_ops;
};
struct snd_soc_codec_conf {