diff options
| author | 2017-09-25 17:33:31 +0100 | |
|---|---|---|
| committer | 2017-09-25 17:33:31 +0100 | |
| commit | 74b33b8481e7c8a66149093f691b9082b50e24fc (patch) | |
| tree | 84dbcbafd8f718abd2623c490e6d39b908bb26ad /include | |
| parent | ASoC: remove unneeded dai->driver->ops check (diff) | |
| parent | ASoC: add missing snd_soc_component_set_jack (diff) | |
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
Diffstat (limited to 'include')
| -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 d22de9712c45..996bdbc125a5 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1487,6 +1487,8 @@ int snd_soc_component_set_sysclk(struct snd_soc_component *component, int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id, int source, unsigned int freq_in, unsigned int freq_out); +int snd_soc_component_set_jack(struct snd_soc_component *component, + struct snd_soc_jack *jack, void *data); #ifdef CONFIG_REGMAP |
