summaryrefslogtreecommitdiff
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 15:48:52 +0400
committerMark Brown <broonie@kernel.org>2014-10-06 15:48:52 +0400
commit64fdf13c8b5ff530f54dd767861f4e25a9ec2fe9 (patch)
tree43d63a2217cb6d6d8a5105f341ccf6804b29fabf /include/sound/soc-dapm.h
parent97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9 (diff)
parent5dc0158a27f65e7efaa6e3cc496d93b4c4c65d19 (diff)
downloadlinux-64fdf13c8b5ff530f54dd767861f4e25a9ec2fe9.tar.xz
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r--include/sound/soc-dapm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index d60c61b4b341..507d58ae09c1 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -432,6 +432,7 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,
int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
const char *pin);
void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card);
+unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);
/* Mostly internal - should not normally be used */
void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm);