diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-08 15:37:57 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-06-08 15:37:57 +0200 |
| commit | 3cbe7ec9b504c6cc0b5e47015db03dc56e9202c1 (patch) | |
| tree | 5676831e3552445316b8252532752375eb7cbb9f /include/linux/mfd | |
| parent | 7d1467b5820a384e3e274ee051f44ff749c5ab71 (diff) | |
| parent | 687d09365fef8fe4bcabb909fe8a5e9a1b0834a2 (diff) | |
Merge branch 'pcf50633-2.6.34' into om-gta02-2.6.34
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/pcf50633/core.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/mfd/pcf50633/core.h b/include/linux/mfd/pcf50633/core.h index 9953fa14ec9..ae2bd97a4c8 100644 --- a/include/linux/mfd/pcf50633/core.h +++ b/include/linux/mfd/pcf50633/core.h @@ -154,13 +154,9 @@ 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; - struct platform_device *input_pdev; - struct platform_device *bl_pdev; - struct platform_device *regulator_pdev[PCF50633_NUM_REGULATORS]; + struct pcf50633_mbc *mbc; + struct pcf50633_adc *adc; + struct pcf50633_bl *bl; }; enum pcf50633_reg_int1 { |