diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-09 08:10:03 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-09 08:10:03 +0100 |
commit | e1e62305afa275b435c8215dc0e799e6f188fe4f (patch) | |
tree | def8ca2756b48e5e948c65e9f5aa5d932a763c14 /include/sound/soc-dapm.h | |
parent | Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next (diff) | |
parent | Merge branch 'topic/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
download | linux-e1e62305afa275b435c8215dc0e799e6f188fe4f.tar.xz linux-e1e62305afa275b435c8215dc0e799e6f188fe4f.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; |