Merge remote-tracking branches 'asoc/topic/sigmadsp', 'asoc/topic/spdif', 'asoc/topic...

diff --cc sound/soc/codecs/tlv320aic31xx.c
index 23419109ecac10982489fa8b283498dfbea79447,23419109ecac10982489fa8b283498dfbea79447,23419109ecac10982489fa8b283498dfbea79447,5128e6685762a2a54f716da3f220fec8d54e93bc,a9c4a8baba88b673a63cf1bae41eefd00885c786..539d1dd3c5e6c6ed42a92728a1e649093de6b4c2
--- 1/sound/soc/codecs/tlv320aic31xx.c
--- 2/sound/soc/codecs/tlv320aic31xx.c
--- 3/sound/soc/codecs/tlv320aic31xx.c
--- 4/sound/soc/codecs/tlv320aic31xx.c
--- 5/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
@@@@@@ -249,17 -249,17 -249,17 -249,16 -249,17 +249,16 @@@@@@ static const char * const mic_select_te
        "Off", "FFR 10 Ohm", "FFR 20 Ohm", "FFR 40 Ohm"
     };
     
--- -static const
--- -SOC_ENUM_SINGLE_DECL(mic1lp_p_enum, AIC31XX_MICPGAPI, 6, mic_select_text);
--- -static const
--- -SOC_ENUM_SINGLE_DECL(mic1rp_p_enum, AIC31XX_MICPGAPI, 4, mic_select_text);
--- -static const
--- -SOC_ENUM_SINGLE_DECL(mic1lm_p_enum, AIC31XX_MICPGAPI, 2, mic_select_text);
---  
---  static const
---  SOC_ENUM_SINGLE_DECL(cm_m_enum, AIC31XX_MICPGAMI, 6, mic_select_text);
---  static const
---  SOC_ENUM_SINGLE_DECL(mic1lm_m_enum, AIC31XX_MICPGAMI, 4, mic_select_text);
+++ +static SOC_ENUM_SINGLE_DECL(mic1lp_p_enum, AIC31XX_MICPGAPI, 6,
+++ +   mic_select_text);
+++ +static SOC_ENUM_SINGLE_DECL(mic1rp_p_enum, AIC31XX_MICPGAPI, 4,
+++ +   mic_select_text);
+++ +static SOC_ENUM_SINGLE_DECL(mic1lm_p_enum, AIC31XX_MICPGAPI, 2,
+++ +   mic_select_text);
+++  
    -static const
    -SOC_ENUM_SINGLE_DECL(cm_m_enum, AIC31XX_MICPGAMI, 6, mic_select_text);
    -static const
    -SOC_ENUM_SINGLE_DECL(mic1lm_m_enum, AIC31XX_MICPGAMI, 4, mic_select_text);
+++ +static SOC_ENUM_SINGLE_DECL(cm_m_enum, AIC31XX_MICPGAMI, 6, mic_select_text);
+++ +static SOC_ENUM_SINGLE_DECL(mic1lm_m_enum, AIC31XX_MICPGAMI, 4,
+++ +   mic_select_text);
     
     static const DECLARE_TLV_DB_SCALE(dac_vol_tlv, -6350, 50, 0);
     static const DECLARE_TLV_DB_SCALE(adc_fgain_tlv, 0, 10, 0);