summaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
authorMark Brown2015-02-04 21:57:06 +0100
committerMark Brown2015-02-04 21:57:06 +0100
commit7a869e108e5d82b021a6ce10d25e97e6b7f5823a (patch)
tree27f832ff7b47b6d3200a084afd0c8ef4ad4a7078 /include/sound/soc-dapm.h
parentMerge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next (diff)
parentMerge branch 'topic/arizona' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
downloadkernel-qcow2-linux-7a869e108e5d82b021a6ce10d25e97e6b7f5823a.tar.gz
kernel-qcow2-linux-7a869e108e5d82b021a6ce10d25e97e6b7f5823a.tar.xz
kernel-qcow2-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.h1
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;