From: Mark Brown <broonie@linaro.org>
Date: Tue, 8 Apr 2014 20:22:11 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/fix/alc5632', 'asoc/fix/cs42l52', 'asoc/fix... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bfef92bb97b48d0ab5a543e2e7de09b6b014603e;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge remote-tracking branches 'asoc/fix/alc5632', 'asoc/fix/cs42l52', 'asoc/fix/cs42xxx8', 'asoc/fix/da732x', 'asoc/fix/davinci', 'asoc/fix/fsl-sai', 'asoc/fix/fsl-ssi' and 'asoc/fix/max98090' into asoc-linus
---

bfef92bb97b48d0ab5a543e2e7de09b6b014603e
diff --cc sound/soc/codecs/max98090.c
index 98c6e104357c,98c6e104357c,98c6e104357c,98c6e104357c,98c6e104357c,98c6e104357c,51f9b3d16b41,98c6e104357c,83a773c11ddb..f7b0b37aa858
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@@@@@@@@@ -872,7 -872,7 -872,7 -872,7 -872,7 -872,7 -859,8 -872,7 -871,7 +872,7 @@@@@@@@@@ static const struct snd_kcontrol_new ma
         
         static const char *dmic_mux_text[] = { "ADC", "DMIC" };
         
      -  static const struct soc_enum dmic_mux_enum =
      -  	SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(dmic_mux_text), dmic_mux_text);
        -static SOC_ENUM_SINGLE_EXT_DECL(dmic_mux_enum, 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);