diff options
| author | Mark Brown <broonie@linaro.org> | 2014-02-10 14:31:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-10 14:31:02 +0100 |
| commit | 70c90ed7eed0860f0a502112cd26eb3848f91865 (patch) | |
| tree | 897474f4838738cddc8a6547aaddd0a5d58a6905 /include/sound | |
| parent | ASoC: simple-card: Add snd_card's name parsing from DT node support (diff) | |
| parent | ASoC: add snd_soc_of_parse_audio_simple_widgets for DT (diff) | |
| download | linux-70c90ed7eed0860f0a502112cd26eb3848f91865.tar.xz linux-70c90ed7eed0860f0a502112cd26eb3848f91865.zip | |
Merge branch 'topic/of' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-simple
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 9a001472b96a..465dc6e0674d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1173,6 +1173,8 @@ void snd_soc_util_exit(void); int snd_soc_of_parse_card_name(struct snd_soc_card *card, const char *propname); +int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card, + const char *propname); int snd_soc_of_parse_audio_routing(struct snd_soc_card *card, const char *propname); unsigned int snd_soc_of_parse_daifmt(struct device_node *np, |