diff options
-rw-r--r-- | drivers/regulator/tps62360-regulator.c | 2 | ||||
-rw-r--r-- | include/linux/regulator/tps62360.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/regulator/tps62360-regulator.c b/drivers/regulator/tps62360-regulator.c index 97fd98bad823..3506900043aa 100644 --- a/drivers/regulator/tps62360-regulator.c +++ b/drivers/regulator/tps62360-regulator.c | |||
@@ -408,7 +408,7 @@ static int __devinit tps62360_probe(struct i2c_client *client, | |||
408 | } | 408 | } |
409 | 409 | ||
410 | config.dev = &client->dev; | 410 | config.dev = &client->dev; |
411 | config.init_data = &pdata->reg_init_data; | 411 | config.init_data = pdata->reg_init_data; |
412 | config.driver_data = tps; | 412 | config.driver_data = tps; |
413 | 413 | ||
414 | /* Register the regulators */ | 414 | /* Register the regulators */ |
diff --git a/include/linux/regulator/tps62360.h b/include/linux/regulator/tps62360.h index 6a5c1b2c751e..5e11d5055643 100644 --- a/include/linux/regulator/tps62360.h +++ b/include/linux/regulator/tps62360.h | |||
@@ -26,8 +26,6 @@ | |||
26 | #ifndef __LINUX_REGULATOR_TPS62360_H | 26 | #ifndef __LINUX_REGULATOR_TPS62360_H |
27 | #define __LINUX_REGULATOR_TPS62360_H | 27 | #define __LINUX_REGULATOR_TPS62360_H |
28 | 28 | ||
29 | #include <linux/regulator/machine.h> | ||
30 | |||
31 | /* | 29 | /* |
32 | * struct tps62360_regulator_platform_data - tps62360 regulator platform data. | 30 | * struct tps62360_regulator_platform_data - tps62360 regulator platform data. |
33 | * | 31 | * |
@@ -44,7 +42,7 @@ | |||
44 | * @vsel1_def_state: Default state of vsel1. 1 if it is high else 0. | 42 | * @vsel1_def_state: Default state of vsel1. 1 if it is high else 0. |
45 | */ | 43 | */ |
46 | struct tps62360_regulator_platform_data { | 44 | struct tps62360_regulator_platform_data { |
47 | struct regulator_init_data reg_init_data; | 45 | struct regulator_init_data *reg_init_data; |
48 | bool en_force_pwm; | 46 | bool en_force_pwm; |
49 | bool en_discharge; | 47 | bool en_discharge; |
50 | bool en_internal_pulldn; | 48 | bool en_internal_pulldn; |