diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-28 00:09:26 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 00:09:26 -0700 |
| commit | 0810048713c829f626d8323519f69091ad2480b0 (patch) | |
| tree | 7af441293e72ea68f4eb7a6de6c7250a242119bb /include | |
| parent | 4348be7a589d587cf0a314bdd1d848e1b9cf9c0b (diff) | |
| parent | 3e7b706ca5151849e4ca91f7f3d8d6d8d8f7b667 (diff) | |
| download | linux-stable-0810048713c829f626d8323519f69091ad2480b0.tar.gz linux-stable-0810048713c829f626d8323519f69091ad2480b0.tar.bz2 linux-stable-0810048713c829f626d8323519f69091ad2480b0.zip | |
Merge branch 'for_3.6/cleanup/twl-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes-non-critical
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c/twl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 3993477103a5..555382660bc4 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -683,7 +683,6 @@ struct twl4030_audio_data { }; struct twl4030_platform_data { - unsigned irq_base, irq_end; struct twl4030_clock_init_data *clock; struct twl4030_bci_platform_data *bci; struct twl4030_gpio_platform_data *gpio; |