diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-04-28 02:13:43 +0100 |
| commit | a2c05e91b991179d43e358d5eb9390f57a59a75f (patch) | |
| tree | 6f33a25e977d47558ea914ddd96be05683f1d366 /include/linux | |
| parent | 2e1be9f7b359d653331876968e68e849857222d3 (diff) | |
| parent | 71622e15dd4d497447d19317d93292184ceb67d9 (diff) | |
Merge remote-tracking branch 'regulator/topic/max8952' into v3.9-rc8
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/max8952.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/regulator/max8952.h b/include/linux/regulator/max8952.h index 45e42855ad05..4dbb63a1d4ab 100644 --- a/include/linux/regulator/max8952.h +++ b/include/linux/regulator/max8952.h @@ -122,13 +122,13 @@ struct max8952_platform_data { int gpio_vid1; int gpio_en; - u8 default_mode; - u8 dvs_mode[MAX8952_NUM_DVS_MODE]; /* MAX8952_DVS_MODEx_XXXXmV */ + u32 default_mode; + u32 dvs_mode[MAX8952_NUM_DVS_MODE]; /* MAX8952_DVS_MODEx_XXXXmV */ - u8 sync_freq; - u8 ramp_speed; + u32 sync_freq; + u32 ramp_speed; - struct regulator_init_data reg_data; + struct regulator_init_data *reg_data; }; |