aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/pcf50633-regulator.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/pcf50633-regulator.c
parentregulator: Convert rc5t583 to set_voltage (diff)
parentregulator: max8649: Constify regulator_desc (diff)
downloadlinux-dev-1474e4dbcae04125ed6e503eadcef266846f4675.tar.xz
linux-dev-1474e4dbcae04125ed6e503eadcef266846f4675.zip
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/pcf50633-regulator.c')
-rw-r--r--drivers/regulator/pcf50633-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
index b62f4c856821..43163f14bec7 100644
--- a/drivers/regulator/pcf50633-regulator.c
+++ b/drivers/regulator/pcf50633-regulator.c
@@ -267,7 +267,7 @@ static struct regulator_ops pcf50633_regulator_ops = {
.is_enabled = pcf50633_regulator_is_enabled,
};
-static struct regulator_desc regulators[] = {
+static const struct regulator_desc regulators[] = {
[PCF50633_REGULATOR_AUTO] =
PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 128),
[PCF50633_REGULATOR_DOWN1] =