diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-12 18:48:30 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-12 18:48:30 (GMT) |
| commit | d1113af4e8c0f2cd71e52cb904447bd0eec8aa54 (patch) | |
| tree | 60de96c5b9716f6115ed68507c0deb361d063569 /include/sound | |
| parent | 89a88dd3d6823f46bfb1405c4b358f89d5526cd6 (diff) | |
| parent | a5053a8e200e865ab786384df3f985a3cbb346fe (diff) | |
| download | linux-d1113af4e8c0f2cd71e52cb904447bd0eec8aa54.tar.xz | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 2 | ||||
| -rw-r--r-- | include/sound/soc-dpcm.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 8d7416e..485fc9d 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; diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index 98f2ade..8060590 100644 --- a/include/sound/soc-dpcm.h +++ b/include/sound/soc-dpcm.h @@ -135,7 +135,7 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream, /* internal use only */ int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute); -int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); +void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); int soc_dpcm_runtime_update(struct snd_soc_card *); int dpcm_path_get(struct snd_soc_pcm_runtime *fe, |