From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 7 Aug 2009 10:43:58 +0000 (+0100)
Subject: Merge branch 'reg-cache' into for-2.6.32
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=06cddefc1f25b847dafe392f3d5781482b3395b5;p=linux-edison.git

Merge branch 'reg-cache' into for-2.6.32
---

06cddefc1f25b847dafe392f3d5781482b3395b5
diff --cc include/sound/soc.h
index 55b33093726,4a5846e7247..dbb1702688c
--- a/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;