summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-topology.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-09-09 15:55:18 +0200
committerMark Brown <broonie@kernel.org>2019-09-09 15:55:18 +0200
commit6652ddbb5d83ecfc2591b92be063519714e40ebf (patch)
treeb1d088382aadb792e703b2f4035e0fc6584ca3c1 /sound/soc/soc-topology.c
parentLinux 5.3-rc8 (diff)
parentASoC: ams-delta: Take control over audio mute GPIO pins (diff)
downloadlinux-6652ddbb5d83ecfc2591b92be063519714e40ebf.tar.xz
linux-6652ddbb5d83ecfc2591b92be063519714e40ebf.zip
Merge branch 'asoc-5.3' into asoc-linus
Diffstat (limited to 'sound/soc/soc-topology.c')
-rw-r--r--sound/soc/soc-topology.c6
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);