Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[~andy/linux] / include / sound / soc.h

diff --git a/include/sound/soc.h b/include/sound/soc.h
index db6edba8ef08c1de709bfbb60e591a7e80c7353b..f47ef1f75f18107a92e86e69f864ea1e6b0aec47 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -201,8 +201,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_info *uinfo);
 int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_info *uinfo);
-int snd_soc_info_bool_ext(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_info *uinfo);
+#define snd_soc_info_bool_ext          snd_ctl_boolean_mono
 int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol);
 int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,