diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:57:06 +0000 |
| commit | 7a869e108e5d82b021a6ce10d25e97e6b7f5823a (patch) | |
| tree | 27f832ff7b47b6d3200a084afd0c8ef4ad4a7078 /include/sound/soc-dapm.h | |
| parent | 7d590e462315f40f821599bcc0b2b6b7f62142a8 (diff) | |
| parent | 60d66c9a24907c8c965be4c7d15f67bd9d54b553 (diff) | |
| download | blackbird-op-linux-7a869e108e5d82b021a6ce10d25e97e6b7f5823a.tar.gz blackbird-op-linux-7a869e108e5d82b021a6ce10d25e97e6b7f5823a.zip | |
Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
Diffstat (limited to 'include/sound/soc-dapm.h')
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index a2a0cf6e74fd..8d7416e46861 100644 --- 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; |
