Merge branch 'reg-cache' into for-2.6.32

diff --cc include/sound/soc.h
index 55b330937260e95b5339760053828b0099f612c8,4a5846e724738346e77997cac6847e94ef056cd8..dbb1702688cd44329c3eeb7f2f3977b8cc03872f
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
+++ b/include/sound/soc.h
@@@ -385,9 -372,8 +394,9 @@@ struct snd_soc_codec 
        int (*display_register)(struct snd_soc_codec *, char *,
                                size_t, unsigned int);
        int (*volatile_register)(unsigned int);
 +      int (*readable_register)(unsigned int);
        hw_write_t hw_write;
-       hw_read_t hw_read;
+       unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);
        void *reg_cache;
        short reg_cache_size;
        short reg_cache_step;

diff --cc sound/soc/codecs/tlv320aic3x.c
Simple merge

diff --cc sound/soc/codecs/wm8510.c
Simple merge

diff --cc sound/soc/codecs/wm8731.c
Simple merge

diff --cc sound/soc/codecs/wm9081.c
Simple merge