diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:25 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:25 -0400 |
| commit | 6234eabf84d6dcb2e28d4fdae43029c04c1bbc46 (patch) | |
| tree | 3d451ebd41c9cabb206fd3033f135e943de04da6 /include/sound | |
| parent | ece59528fa0318825a23a7c297b2fe8cddfca0a2 (diff) | |
| parent | 92bb4c32708ee3e1d6eb0e185d678dab35152daf (diff) | |
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 2 |
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, | |||
| 477 | struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template, | 477 | struct snd_kcontrol *snd_soc_cnew(const struct snd_kcontrol_new *_template, |
| 478 | void *data, const char *long_name, | 478 | void *data, const char *long_name, |
| 479 | const char *prefix); | 479 | const char *prefix); |
| 480 | struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card, | ||
| 481 | const char *name); | ||
| 480 | int snd_soc_add_codec_controls(struct snd_soc_codec *codec, | 482 | int snd_soc_add_codec_controls(struct snd_soc_codec *codec, |
| 481 | const struct snd_kcontrol_new *controls, int num_controls); | 483 | const struct snd_kcontrol_new *controls, int num_controls); |
| 482 | int snd_soc_add_platform_controls(struct snd_soc_platform *platform, | 484 | int snd_soc_add_platform_controls(struct snd_soc_platform *platform, |