summaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:56:58 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-12 13:56:58 +0100
commit56c32c751cdf4aee810b4ad537ab1d836ee8f516 (patch)
treed9a53471e7ce903d7b5eb7460f1aad7f3179bf9d /include/sound/soc-dapm.h
parent54b019cbd993bb9d432a27a51a800f4981aa2f1c (diff)
parent379cf39781fdb34c75bab6ac54707bc4466f3dc4 (diff)
downloadlinux-56c32c751cdf4aee810b4ad537ab1d836ee8f516.tar.gz
linux-56c32c751cdf4aee810b4ad537ab1d836ee8f516.tar.bz2
linux-56c32c751cdf4aee810b4ad537ab1d836ee8f516.zip
Merge remote-tracking branch 'asoc/topic/core' 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 44a30b108683..d4609029f014 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -566,7 +566,6 @@ struct snd_soc_dapm_update {
/* DAPM context */
struct snd_soc_dapm_context {
- int n_widgets; /* number of widgets in this context */
enum snd_soc_bias_level bias_level;
enum snd_soc_bias_level suspend_bias_level;
struct delayed_work delayed_work;