Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next

2015-02-04 20:57:06 +00:00
parent 7d590e4623 60d66c9a24
commit 7a869e108e
54 changed files with 543 additions and 240 deletions
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -525,7 +525,6 @@ struct snd_soc_dapm_widget {
 	enum snd_soc_dapm_type id;
 	const char *name;		/* widget name */
 	const char *sname;	/* stream name */
-	struct snd_soc_codec *codec;
 	struct list_head list;
 	struct snd_soc_dapm_context *dapm;