diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 13:59:25 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 13:59:25 +0100 |
| commit | 04697d0e4011a0f2942411acff56f9bc9ca6c11a (patch) | |
| tree | b5c2e552a77ce54aeb0859f62d3e0ef26d3d5696 /include/linux/mfd/pcf50633/core.h | |
| parent | e447c3d0b2ddaf8c2e98c9819d1c545ae7274f20 (diff) | |
| parent | b29086188b50e3794533074c2831b4b44507e7e9 (diff) | |
Merge branch 'pcf50633-2.6.32' into om-gta02-2.6.32om-gta02-2.6.32
Diffstat (limited to 'include/linux/mfd/pcf50633/core.h')
| -rw-r--r-- | include/linux/mfd/pcf50633/core.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h index 42f9af553ed..e69829b6e90 100644 --- a/include/linux/mfd/pcf50633/core.h +++ b/include/linux/mfd/pcf50633/core.h @@ -19,6 +19,7 @@ #include <linux/regulator/machine.h> #include <linux/power_supply.h> #include <linux/mfd/pcf50633/backlight.h> +#include <linux/gpio.h> struct pcf50633; @@ -41,6 +42,8 @@ struct pcf50633_platform_data { u8 resumers[5]; struct pcf50633_bl_platform_data *backlight_data; + + int gpio_base; }; struct pcf50633_irq { @@ -146,6 +149,7 @@ struct pcf50633 { int onkey1s_held; + struct platform_device *gpio_pdev; struct platform_device *rtc_pdev; struct platform_device *mbc_pdev; struct platform_device *adc_pdev; |