diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 10:31:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 10:31:42 +0100 |
| commit | 7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec (patch) | |
| tree | dda57eb9683f421e9438effbdaf719adced18e3d /include/sound/soc-dapm.h | |
| parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
| parent | 48118a9323ab715358bf63f5172c5c2b8cf5f455 (diff) | |
| download | lwn-7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec.tar.gz lwn-7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec.zip | |
Merge branch 'asoc-5.3' into asoc-linus
Diffstat (limited to 'include/sound/soc-dapm.h')
| -rw-r--r-- | include/sound/soc-dapm.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index c00a0b8ade08..8a90816a6eb5 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -402,6 +402,9 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, struct snd_soc_dapm_widget *snd_soc_dapm_new_control( struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget); +struct snd_soc_dapm_widget *snd_soc_dapm_new_control_unlocked( + struct snd_soc_dapm_context *dapm, + const struct snd_soc_dapm_widget *widget); int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, struct snd_soc_dai *dai); int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card); |