Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37

diff --cc sound/soc/codecs/tlv320aic3x.c
index 0b80e242a66df8623204bb9340d86e376cde7707,c07465720cdb2d8c134f6fc84dad96841c64b081..efae8b53fd64134a8095e0d362bf76815139e64b
--- 1/sound/soc/codecs/tlv320aic3x.c
--- 2/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@ -1241,8 -1289,12 +1291,10 @@@ static int aic3x_probe(struct snd_soc_c
                            (aic3x->setup->gpio_func[1] & 0xf) << 4);
        }
  
 -      aic3x_init(codec);
 -
        snd_soc_add_controls(codec, aic3x_snd_controls,
                             ARRAY_SIZE(aic3x_snd_controls));
+       if (aic3x->model == AIC3X_MODEL_3007)
+               snd_soc_add_controls(codec, &aic3x_classd_amp_gain_ctrl, 1);
  
        aic3x_add_widgets(codec);