Merge branch 'for-2.6.37' into for-2.6.38

This commit is contained in:
Mark Brown
2010-12-28 23:42:53 +00:00
12 changed files with 164 additions and 226 deletions

View File

@@ -720,6 +720,7 @@ static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,
if (wm8971 == NULL)
return -ENOMEM;
wm8971->control_type = SND_SOC_I2C;
i2c_set_clientdata(i2c, wm8971);
ret = snd_soc_register_codec(&i2c->dev,