diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:43 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-04 18:32:43 +0300 |
| commit | 88f268a5bcc3b0683e6fbaf9973702e5329fc1e3 (patch) | |
| tree | a64bf49e575ece017359ba5ac89fbc52efd81f2a /drivers/regulator/palmas-regulator.c | |
| parent | c364098fe8745b08a491fb43de785806ca91ba5e (diff) | |
| parent | e5680c4de3eb3ea5538d11733a91ccef19badd69 (diff) | |
| download | linux-88f268a5bcc3b0683e6fbaf9973702e5329fc1e3.tar.xz | |
Merge branch 'regulator-5.1' into regulator-next
Diffstat (limited to 'drivers/regulator/palmas-regulator.c')
| -rw-r--r-- | drivers/regulator/palmas-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index c2cc392a27d4..7fb9e8dd834e 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -382,7 +382,7 @@ static struct palmas_sleep_requestor_info tps65917_sleep_req_info[] = { EXTERNAL_REQUESTOR_TPS65917(LDO5, 2, 4), }; -static unsigned int palmas_smps_ramp_delay[4] = {0, 10000, 5000, 2500}; +static const unsigned int palmas_smps_ramp_delay[4] = {0, 10000, 5000, 2500}; #define SMPS_CTRL_MODE_OFF 0x00 #define SMPS_CTRL_MODE_ON 0x01 |