summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-10 18:04:46 +0300
committerMark Brown <broonie@kernel.org>2015-04-10 18:04:46 +0300
commit5f97a4bd2c92aff216581d662a37163881ac3888 (patch)
tree0e6fea7c81c70da558a2064f7f97da293f63c3f1 /include/sound
parent6553bf06a369683408895b87e5172aa99a9266bd (diff)
parent7c0e3facf39a68f30c2eae69e969918eca1ff9d6 (diff)
downloadlinux-5f97a4bd2c92aff216581d662a37163881ac3888.tar.xz
Merge branch 'topic/delay' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dapm.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8d7416e46861..485fc9d1a7bc 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -586,8 +586,6 @@ struct snd_soc_dapm_update {
/* DAPM context */
struct snd_soc_dapm_context {
enum snd_soc_bias_level bias_level;
- enum snd_soc_bias_level suspend_bias_level;
- struct delayed_work delayed_work;
unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
/* Go to BIAS_OFF in suspend if the DAPM context is idle */
unsigned int suspend_bias_off:1;