diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 06:00:43 -0400 |
| commit | d71f4cece4bd97d05592836202fc04ff2e7817e3 (patch) | |
| tree | 6c877c7a938758b1323d9c97d46b9c536e618c69 /include/linux/i2c/twl.h | |
| parent | 19008bdacb9f7841166ebafe0aef361ee582ffbf (diff) | |
| parent | ad8332c1302bcb4f80d593fd3eb477be9d7f5604 (diff) | |
Merge branch 'topic/asoc' into for-linus
Conflicts:
sound/soc/codecs/ad1938.c
Diffstat (limited to 'include/linux/i2c/twl.h')
| -rw-r--r-- | include/linux/i2c/twl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index fb6784e86d5f..ebd90ce58ca2 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -569,9 +569,9 @@ struct twl4030_codec_data { | |||
| 569 | struct twl4030_codec_audio_data *audio; | 569 | struct twl4030_codec_audio_data *audio; |
| 570 | struct twl4030_codec_vibra_data *vibra; | 570 | struct twl4030_codec_vibra_data *vibra; |
| 571 | 571 | ||
| 572 | /* twl6030 */ | 572 | /* twl6040 */ |
| 573 | int audpwron_gpio; /* audio power-on gpio */ | 573 | int audpwron_gpio; /* audio power-on gpio */ |
| 574 | int naudint_irq; /* audio interrupt */ | 574 | int naudint_irq; /* audio interrupt */ |
| 575 | }; | 575 | }; |
| 576 | 576 | ||
| 577 | struct twl4030_platform_data { | 577 | struct twl4030_platform_data { |