diff options
author | Takashi Iwai <tiwai@suse.de> | 2020-02-18 13:33:39 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2020-02-18 13:33:39 +0100 |
commit | 385536090b18534967b1073d0f18b5b86d793c30 (patch) | |
tree | 9b285dce92694b45ac1fba2e37806baadbd4f85a /include | |
parent | 44eeb081b8630bb3ad3cd381d1ae1831463e48bb (diff) | |
parent | 96781fd941b39e1f78098009344ebcd7af861c67 (diff) | |
download | linux-385536090b18534967b1073d0f18b5b86d793c30.tar.bz2 |
Merge tag 'asoc-fix-v5.6-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.6
A few fixes sent in since the merge window, none of them with global
impact but all important for the users they affect.
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 2a306c6f3fbc..1b6afbc1a4ed 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, |