diff options
| author | Mark Brown <broonie@kernel.org> | 2017-09-25 12:33:31 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-25 12:33:31 -0400 |
| commit | 74b33b8481e7c8a66149093f691b9082b50e24fc (patch) | |
| tree | 84dbcbafd8f718abd2623c490e6d39b908bb26ad | |
| parent | 9900a4226c785dbb32c08af5ae8fbbf1fc4c31d0 (diff) | |
| parent | 840bc44849b9d7f8eaae34ac7b434e17c4cf7368 (diff) | |
Merge branch 'topic/component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-core
| -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, | |||
| 1487 | int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id, | 1487 | int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id, |
| 1488 | int source, unsigned int freq_in, | 1488 | int source, unsigned int freq_in, |
| 1489 | unsigned int freq_out); | 1489 | unsigned int freq_out); |
| 1490 | int snd_soc_component_set_jack(struct snd_soc_component *component, | ||
| 1491 | struct snd_soc_jack *jack, void *data); | ||
| 1490 | 1492 | ||
| 1491 | #ifdef CONFIG_REGMAP | 1493 | #ifdef CONFIG_REGMAP |
| 1492 | 1494 | ||