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/tps65217-regulator.c | |
parent | f604c10cdeba4e068afa96be2bee878fb5227f8b (diff) | |
parent | 09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff) | |
download | blackbird-op-linux-1474e4dbcae04125ed6e503eadcef266846f4675.tar.gz blackbird-op-linux-1474e4dbcae04125ed6e503eadcef266846f4675.zip |
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/tps65217-regulator.c')
-rw-r--r-- | drivers/regulator/tps65217-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c index e39521b42772..80fad2d3479e 100644 --- a/drivers/regulator/tps65217-regulator.c +++ b/drivers/regulator/tps65217-regulator.c @@ -312,7 +312,7 @@ static struct regulator_ops tps65217_pmic_ldo1_ops = { .list_voltage = tps65217_pmic_list_voltage, }; -static struct regulator_desc regulators[] = { +static const struct regulator_desc regulators[] = { TPS65217_REGULATOR("DCDC1", TPS65217_DCDC_1, tps65217_pmic_ops, 64), TPS65217_REGULATOR("DCDC2", TPS65217_DCDC_2, tps65217_pmic_ops, 64), TPS65217_REGULATOR("DCDC3", TPS65217_DCDC_3, tps65217_pmic_ops, 64), |