summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 15:28:25 +0200
committerMark Brown <broonie@linaro.org>2013-08-22 15:28:25 +0200
commit6234eabf84d6dcb2e28d4fdae43029c04c1bbc46 (patch)
tree3d451ebd41c9cabb206fd3033f135e943de04da6 /include/sound
parentMerge remote-tracking branch 'asoc/topic/ads711x' into asoc-next (diff)
parentASoC: wm_adsp: Sanitize parameter passing (diff)
downloadlinux-6234eabf84d6dcb2e28d4fdae43029c04c1bbc46.tar.xz
linux-6234eabf84d6dcb2e28d4fdae43029c04c1bbc46.zip
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index c0ac3bc7b7f4..95d332851c72 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -477,6 +477,8 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template,
void *data, const char *long_name,
const char *prefix);
+struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card,
+ const char *name);
int snd_soc_add_codec_controls(struct snd_soc_codec *codec,
const struct snd_kcontrol_new *controls, int num_controls);
int snd_soc_add_platform_controls(struct snd_soc_platform *platform,