Merge branch 'for-2.6.37' into for-2.6.38

2010-11-22 20:33:12 +00:00
parent c7b642911e eba19fdd81
commit cbe80def41
5 changed files with 7 additions and 5 deletions
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
@@ -383,6 +383,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = {
 	.reg_cache_size = sizeof(stac9766_reg),
 	.reg_word_size = sizeof(u16),
 	.reg_cache_step = 2,
+	.reg_cache_default = stac9766_reg,
 };

 static __devinit int stac9766_probe(struct platform_device *pdev)