Merge tag 'for-v3.10' of git://git.infradead.org/battery-2.6

[pandora-kernel.git] / include / linux / mfd / abx500 / ab8500.h

diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index b5780fd..fb1bf7d 100644 (file)
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -365,8 +365,7 @@ struct ab8500 {
        int it_latchhier_num;
 };
 
-struct regulator_reg_init;
-struct regulator_init_data;
+struct ab8500_regulator_platform_data;
 struct ab8500_gpio_platform_data;
 struct ab8500_codec_platform_data;
 struct ab8500_sysctrl_platform_data;
@@ -376,19 +375,13 @@ struct ab8500_sysctrl_platform_data;
  * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
  * @pm_power_off: Should machine pm power off hook be registered or not
  * @init: board-specific initialization after detection of ab8500
- * @num_regulator_reg_init: number of regulator init registers
- * @regulator_reg_init: regulator init registers
- * @num_regulator: number of regulators
  * @regulator: machine-specific constraints for regulators
  */
 struct ab8500_platform_data {
        int irq_base;
        bool pm_power_off;
        void (*init) (struct ab8500 *);
-       int num_regulator_reg_init;
-       struct ab8500_regulator_reg_init *regulator_reg_init;
-       int num_regulator;
-       struct regulator_init_data *regulator;
+       struct ab8500_regulator_platform_data *regulator;
        struct abx500_gpio_platform_data *gpio;
        struct ab8500_codec_platform_data *codec;
        struct ab8500_sysctrl_platform_data *sysctrl;