diff options
author | Mark Brown <broonie@kernel.org> | 2019-09-09 16:55:18 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-09-09 16:55:18 +0300 |
commit | 6652ddbb5d83ecfc2591b92be063519714e40ebf (patch) | |
tree | b1d088382aadb792e703b2f4035e0fc6584ca3c1 /sound/soc/soc-topology.c | |
parent | f74c2bb98776e2de508f4d607cd519873065118e (diff) | |
parent | 73681f4f1426847b421649c6aa6c2dc303acc7c8 (diff) | |
download | linux-6652ddbb5d83ecfc2591b92be063519714e40ebf.tar.xz |
Merge branch 'asoc-5.3' into asoc-linus
Diffstat (limited to 'sound/soc/soc-topology.c')
-rw-r--r-- | sound/soc/soc-topology.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index dc463f1a9e24..2eca85c04a3e 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -80,12 +80,6 @@ struct soc_tplg { static int soc_tplg_process_headers(struct soc_tplg *tplg); static void soc_tplg_complete(struct soc_tplg *tplg); -struct snd_soc_dapm_widget * -snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, - const struct snd_soc_dapm_widget *widget); -struct snd_soc_dapm_widget * -snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, - const struct snd_soc_dapm_widget *widget); static void soc_tplg_denum_remove_texts(struct soc_enum *se); static void soc_tplg_denum_remove_values(struct soc_enum *se); |