diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 12:30:21 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 12:30:21 +0100 |
commit | 1474e4dbcae04125ed6e503eadcef266846f4675 (patch) | |
tree | b65a1fb53b4c3c2fb669883faf0b87166b45baaf /drivers/regulator/max8660.c | |
parent | regulator: Convert rc5t583 to set_voltage (diff) | |
parent | regulator: max8649: Constify regulator_desc (diff) | |
download | linux-dev-1474e4dbcae04125ed6e503eadcef266846f4675.tar.xz linux-dev-1474e4dbcae04125ed6e503eadcef266846f4675.zip |
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/max8660.c')
-rw-r--r-- | drivers/regulator/max8660.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index e42db5364ca5..0e327871fd0e 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c @@ -313,7 +313,7 @@ static struct regulator_ops max8660_ldo67_ops = { .set_voltage = max8660_ldo67_set, }; -static struct regulator_desc max8660_reg[] = { +static const struct regulator_desc max8660_reg[] = { { .name = "V3(DCDC)", .id = MAX8660_V3, |