summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/max8660.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 12:30:21 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-09 12:30:21 +0100
commit1474e4dbcae04125ed6e503eadcef266846f4675 (patch)
treeb65a1fb53b4c3c2fb669883faf0b87166b45baaf /drivers/regulator/max8660.c
parentf604c10cdeba4e068afa96be2bee878fb5227f8b (diff)
parent09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff)
downloadop-kernel-dev-1474e4dbcae04125ed6e503eadcef266846f4675.zip
op-kernel-dev-1474e4dbcae04125ed6e503eadcef266846f4675.tar.gz
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/max8660.c')
-rw-r--r--drivers/regulator/max8660.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
index e42db53..0e32787 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,
OpenPOWER on IntegriCloud