Merge remote-tracking branch 'asoc/topic/core' into asoc-next

2013-02-11 11:06:30 +00:00
parent 6a47366973 b5a8fe439a
commit d289323286
4 changed files with 15 additions and 19 deletions
--- 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 {