diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:18 +0100 |
| commit | 6652ddbb5d83ecfc2591b92be063519714e40ebf (patch) | |
| tree | b1d088382aadb792e703b2f4035e0fc6584ca3c1 /include | |
| parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
| parent | 73681f4f1426847b421649c6aa6c2dc303acc7c8 (diff) | |
| download | blackbird-op-linux-6652ddbb5d83ecfc2591b92be063519714e40ebf.tar.gz blackbird-op-linux-6652ddbb5d83ecfc2591b92be063519714e40ebf.zip | |
Merge branch 'asoc-5.3' into asoc-linus
Diffstat (limited to 'include')
| -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); |
