diff options
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 8d7416e46861..485fc9d1a7bc 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -586,8 +586,6 @@ struct snd_soc_dapm_update { | |||
586 | /* DAPM context */ | 586 | /* DAPM context */ |
587 | struct snd_soc_dapm_context { | 587 | struct snd_soc_dapm_context { |
588 | enum snd_soc_bias_level bias_level; | 588 | enum snd_soc_bias_level bias_level; |
589 | enum snd_soc_bias_level suspend_bias_level; | ||
590 | struct delayed_work delayed_work; | ||
591 | unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ | 589 | unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ |
592 | /* Go to BIAS_OFF in suspend if the DAPM context is idle */ | 590 | /* Go to BIAS_OFF in suspend if the DAPM context is idle */ |
593 | unsigned int suspend_bias_off:1; | 591 | unsigned int suspend_bias_off:1; |
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h index 98f2ade0266e..806059052bfc 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, | |||
135 | 135 | ||
136 | /* internal use only */ | 136 | /* internal use only */ |
137 | int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute); | 137 | int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute); |
138 | int soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); | 138 | void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd); |
139 | int soc_dpcm_runtime_update(struct snd_soc_card *); | 139 | int soc_dpcm_runtime_update(struct snd_soc_card *); |
140 | 140 | ||
141 | int dpcm_path_get(struct snd_soc_pcm_runtime *fe, | 141 | int dpcm_path_get(struct snd_soc_pcm_runtime *fe, |