Merge branch 'twl4030-mfd' into for-2.6.33

2009-11-10 12:08:12 +00:00 · 2009-11-10 12:08:12 +00:00 · 0969afcc44
commit 0969afcc44
parent 5f63ef9909 f9b4639e04
9 changed files with 43 additions and 0 deletions
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@ -414,6 +414,7 @@ struct twl4030_codec_vibra_data {
 };

 struct twl4030_codec_data {
+	unsigned int	audio_mclk;
 	struct twl4030_codec_audio_data		*audio;
 	struct twl4030_codec_vibra_data		*vibra;
 };