diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:41 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:41 +0300 |
| commit | c364098fe8745b08a491fb43de785806ca91ba5e (patch) | |
| tree | b2bc730835033ec5e372e7aea2eec9b2c770d2ae /drivers/regulator/wm831x-dcdc.c | |
| parent | 1c163f4c7b3f621efff9b28a47abb36f7378d783 (diff) | |
| parent | c25d47888f0fb3d836d68322d4aea2caf31a75a6 (diff) | |
| download | linux-c364098fe8745b08a491fb43de785806ca91ba5e.tar.xz | |
Merge branch 'regulator-5.0' into regulator-linus
Diffstat (limited to 'drivers/regulator/wm831x-dcdc.c')
| -rw-r--r-- | drivers/regulator/wm831x-dcdc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 5a5bc4bb08d2..df591435d12a 100644 --- a/drivers/regulator/wm831x-dcdc.c +++ b/drivers/regulator/wm831x-dcdc.c @@ -327,8 +327,8 @@ static int wm831x_buckv_get_voltage_sel(struct regulator_dev *rdev) } /* Current limit options */ -static u16 wm831x_dcdc_ilim[] = { - 125, 250, 375, 500, 625, 750, 875, 1000 +static const unsigned int wm831x_dcdc_ilim[] = { + 125000, 250000, 375000, 500000, 625000, 750000, 875000, 1000000 }; static int wm831x_buckv_set_current_limit(struct regulator_dev *rdev, |