Merge branch 'for-2.6.36' of...

Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc

sound/soc/soc-cache.c

@@ -204,7 +204,7 @@ static int snd_soc_8_16_write(struct snd_soc_codec *codec, unsigned int reg,
 	data[2] = value & 0xff;
 
 	if (!snd_soc_codec_volatile_register(codec, reg)
-		&& reg < codec->driver->reg_cache_size)
+		&& reg < codec->reg_cache_size)
 			reg_cache[reg] = value;
 
 	if (codec->cache_only) {