Merge branch 'for-3.1' into for-3.2

This commit is contained in:
Mark Brown 2011-08-11 10:43:40 +09:00
commit 4158a05741

View file

@ -2983,6 +2983,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
wm8994->hubs.dcs_readback_mode = 2;
break;
}
break;
case WM8958:
wm8994->hubs.dcs_readback_mode = 1;