diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-01 06:38:59 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-01 06:38:59 -0500 |
| commit | 6679ee1870f7ccdd48e2e5c57919240b8f19a6dc (patch) | |
| tree | 225ed7efcc0bb7e3c90233576c6106538e17a275 /include/linux | |
| parent | a91a4aa1ee994abeb2190a1bb2f703933609a703 (diff) | |
| parent | a0b62329bb290c10d7278809af910ed115768991 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2c/twl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index bf1c5be1f5b6..7897f3096560 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -547,6 +547,10 @@ struct twl4030_codec_data { | |||
| 547 | unsigned int audio_mclk; | 547 | unsigned int audio_mclk; |
| 548 | struct twl4030_codec_audio_data *audio; | 548 | struct twl4030_codec_audio_data *audio; |
| 549 | struct twl4030_codec_vibra_data *vibra; | 549 | struct twl4030_codec_vibra_data *vibra; |
| 550 | |||
| 551 | /* twl6030 */ | ||
| 552 | int audpwron_gpio; /* audio power-on gpio */ | ||
| 553 | int naudint_irq; /* audio interrupt */ | ||
| 550 | }; | 554 | }; |
| 551 | 555 | ||
| 552 | struct twl4030_platform_data { | 556 | struct twl4030_platform_data { |
