summaryrefslogtreecommitdiffstats
path: root/include/sound/soc-dapm.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-02-24 22:26:06 +0000
committerMark Brown <broonie@kernel.org>2020-02-24 22:26:06 +0000
commit6c8beff74c6aafa60cb69b44139de58b74a775e7 (patch)
treebeeb7ed4968bb1426a38fbc77e3d71ecd4306fbd /include/sound/soc-dapm.h
parent6bff73c6115d088fee4d09aff65e145b990382eb (diff)
parent8308a09e87d2cb51adb186dc7d5a5c1913fb0758 (diff)
downloadlinux-6c8beff74c6aafa60cb69b44139de58b74a775e7.tar.bz2
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r--include/sound/soc-dapm.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 464b20acd720..08495f8d86dc 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -392,8 +392,6 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
-int snd_soc_dapm_put_enum_double_locked(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol);
int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo);
int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,