summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/tps6105x-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 13:30:21 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 13:30:21 +0200
commit1474e4dbcae04125ed6e503eadcef266846f4675 (patch)
treeb65a1fb53b4c3c2fb669883faf0b87166b45baaf /drivers/regulator/tps6105x-regulator.c
parentregulator: Convert rc5t583 to set_voltage (diff)
parentregulator: max8649: Constify regulator_desc (diff)
downloadlinux-1474e4dbcae04125ed6e503eadcef266846f4675.tar.xz
linux-1474e4dbcae04125ed6e503eadcef266846f4675.zip
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/tps6105x-regulator.c')
-rw-r--r--drivers/regulator/tps6105x-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c
index d9278da18a9e..3b788977cb72 100644
--- a/drivers/regulator/tps6105x-regulator.c
+++ b/drivers/regulator/tps6105x-regulator.c
@@ -123,7 +123,7 @@ static struct regulator_ops tps6105x_regulator_ops = {
.list_voltage = tps6105x_regulator_list_voltage,
};
-static struct regulator_desc tps6105x_regulator_desc = {
+static const struct regulator_desc tps6105x_regulator_desc = {
.name = "tps6105x-boost",
.ops = &tps6105x_regulator_ops,
.type = REGULATOR_VOLTAGE,