diff --git a/[refs] b/[refs] index 9728924062f1..244f5f1f464e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db382da5ff286b406c4819cc9ebd96bbb680884c +refs/heads/master: 1576a5ff4929a4082307be0c69bb36826aafaad6 diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h index 1738c2b6b373..88ba85a422fb 100644 --- a/trunk/include/sound/soc.h +++ b/trunk/include/sound/soc.h @@ -393,7 +393,6 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); -#define snd_soc_put_volsw_2r snd_soc_put_volsw int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,