Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc...

diff --cc sound/soc/codecs/max98090.c
index 96a4745,361862d,51f9b3d..98c6e10
--- 1/sound/soc/codecs/max98090.c
--- 2/sound/soc/codecs/max98090.c
--- 3/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@ -872,7 -871,7 -859,8 +872,7 @@@@ static const struct snd_kcontrol_new ma
   
   static const char *dmic_mux_text[] = { "ADC", "DMIC" };
   
 - static SOC_ENUM_SINGLE_EXT_DECL(dmic_mux_enum, dmic_mux_text);
  -static const struct soc_enum dmic_mux_enum =
  -     SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(dmic_mux_text), dmic_mux_text);
 ++static SOC_ENUM_SINGLE_VIRT_DECL(dmic_mux_enum, dmic_mux_text);
   
   static const struct snd_kcontrol_new max98090_dmic_mux =
        SOC_DAPM_ENUM_VIRT("DMIC Mux", dmic_mux_enum);