From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 8 May 2011 13:43:18 +0000 (+0100)
Subject: Merge branch 'for-2.6.39' into for-2.6.40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5e8bc53b7c79c8184ca1a90f73286acff22f4c92;p=linux-beck.git

Merge branch 'for-2.6.39' into for-2.6.40
---

5e8bc53b7c79c8184ca1a90f73286acff22f4c92
diff --cc sound/soc/codecs/ssm2602.c
index 7e2194975360,b04d28039c16..565bc72fb173
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@@ -551,8 -599,10 +551,8 @@@ static struct snd_soc_codec_driver soc_
  	.remove =	ssm2602_remove,
  	.suspend =	ssm2602_suspend,
  	.resume =	ssm2602_resume,
 -	.read = ssm2602_read_reg_cache,
 -	.write = ssm2602_write,
  	.set_bias_level = ssm2602_set_bias_level,
- 	.reg_cache_size = sizeof(ssm2602_reg),
+ 	.reg_cache_size = ARRAY_SIZE(ssm2602_reg),
  	.reg_word_size = sizeof(u16),
  	.reg_cache_default = ssm2602_reg,
  };