diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-10 17:04:46 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-10 17:04:46 +0200 |
| commit | 5f97a4bd2c92aff216581d662a37163881ac3888 (patch) | |
| tree | 0e6fea7c81c70da558a2064f7f97da293f63c3f1 /include/sound | |
| parent | ASoC: Don't try to register debugfs entries if the parent does not exist (diff) | |
| parent | ASoC: dapm: Remove delayed_work from dapm context struct (diff) | |
| download | linux-5f97a4bd2c92aff216581d662a37163881ac3888.tar.xz linux-5f97a4bd2c92aff216581d662a37163881ac3888.zip | |
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.h | 2 |
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; |