diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-10 07:08:12 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-10 07:08:12 -0500 |
| commit | 0969afcc449d5d655784c04e938cf4cfc6e89c0e (patch) | |
| tree | a763ddfc2969cb820da13dcec6065801bfe79f65 /include/linux/i2c | |
| parent | 5f63ef9909c187581c7f2c28fbc93866a0d59f7f (diff) | |
| parent | f9b4639e045c750e2bad37462476403995508350 (diff) | |
Merge branch 'twl4030-mfd' into for-2.6.33
Diffstat (limited to 'include/linux/i2c')
| -rw-r--r-- | include/linux/i2c/twl4030.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h index ba61add3e05a..5306a759cbde 100644 --- a/include/linux/i2c/twl4030.h +++ b/include/linux/i2c/twl4030.h | |||
| @@ -414,6 +414,7 @@ struct twl4030_codec_vibra_data { | |||
| 414 | }; | 414 | }; |
| 415 | 415 | ||
| 416 | struct twl4030_codec_data { | 416 | struct twl4030_codec_data { |
| 417 | unsigned int audio_mclk; | ||
| 417 | struct twl4030_codec_audio_data *audio; | 418 | struct twl4030_codec_audio_data *audio; |
| 418 | struct twl4030_codec_vibra_data *vibra; | 419 | struct twl4030_codec_vibra_data *vibra; |
| 419 | }; | 420 | }; |