summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-26 11:15:56 +0900
committerMark Brown <broonie@kernel.org>2015-10-26 11:15:56 +0900
commit12e7b4a4f3096fcb93b222ba644e975ffcf4f21b (patch)
treedf62e535cacd8d868fb315808249076b08e32e9b /include/sound
parent6439e5c2a784f6b00dd136df54d6f0859bc77af3 (diff)
parent93e39a11520c000c9086215460bf27b35b09c724 (diff)
downloadlinux-12e7b4a4f3096fcb93b222ba644e975ffcf4f21b.tar.bz2
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dapm.h3
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);