Merge branch 'for-2.6.29' into for-2.6.30

2 files changed, 2 insertions, 15 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 075244ef41eb..0accdba211f9 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -188,7 +188,7 @@
         .private_value = (unsigned long)&xenum }
 #define SOC_DAPM_VALUE_ENUM(xname, xenum) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
-        .info = snd_soc_info_value_enum_double, \
+        .info = snd_soc_info_enum_double, \
         .get = snd_soc_dapm_get_value_enum_double, \
         .put = snd_soc_dapm_put_value_enum_double, \
         .private_value = (unsigned long)&xenum }
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 9d5a0362a055..7039343e8a78 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -106,7 +106,7 @@
         .private_value = (unsigned long)&xenum }
 #define SOC_VALUE_ENUM(xname, xenum) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\
-        .info = snd_soc_info_value_enum_double, \
+        .info = snd_soc_info_enum_double, \
         .get = snd_soc_get_value_enum_double, \
         .put = snd_soc_put_value_enum_double, \
         .private_value = (unsigned long)&xenum }
@@ -224,8 +224,6 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
-int snd_soc_info_value_enum_double(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol,
@@ -453,17 +451,6 @@ struct soc_enum {
         unsigned char shift_l;
         unsigned char shift_r;
         unsigned int max;
-        const char **texts;
-        void *dapm;
-};
-
-/* semi enumerated kcontrol */
-struct soc_value_enum {
-        unsigned short reg;
-        unsigned short reg2;
-        unsigned char shift_l;
-        unsigned char shift_r;
-        unsigned int max;
         unsigned int mask;
         const char **texts;
         const unsigned int *values;