diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-11-02 09:00:37 +0100 |
commit | bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5 (patch) | |
tree | 1731a322d153ee18017822a8fd66295a0ec7a4e2 /include/sound/soc-dapm.h | |
parent | cadd16ea33a938d49aee99edd4758cc76048b399 (diff) | |
parent | 2c8d08925272b9be383cd81f1973c6faf9fbf53a (diff) | |
download | blackbird-obmc-linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.gz blackbird-obmc-linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r-- | include/sound/soc-dapm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 5abba037d245..7855cfe46b69 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -451,6 +451,9 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream, struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm( struct snd_kcontrol *kcontrol); +struct snd_soc_dapm_widget *snd_soc_dapm_kcontrol_widget( + struct snd_kcontrol *kcontrol); + int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level); |