diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 07:30:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 07:30:21 -0400 |
| commit | 1474e4dbcae04125ed6e503eadcef266846f4675 (patch) | |
| tree | b65a1fb53b4c3c2fb669883faf0b87166b45baaf /drivers/regulator/wm8994-regulator.c | |
| parent | f604c10cdeba4e068afa96be2bee878fb5227f8b (diff) | |
| parent | 09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff) | |
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/wm8994-regulator.c')
| -rw-r--r-- | drivers/regulator/wm8994-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index 75ed402d9f43..8a4897a35f28 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c | |||
| @@ -209,7 +209,7 @@ static struct regulator_ops wm8994_ldo2_ops = { | |||
| 209 | .set_voltage = wm8994_ldo2_set_voltage, | 209 | .set_voltage = wm8994_ldo2_set_voltage, |
| 210 | }; | 210 | }; |
| 211 | 211 | ||
| 212 | static struct regulator_desc wm8994_ldo_desc[] = { | 212 | static const struct regulator_desc wm8994_ldo_desc[] = { |
| 213 | { | 213 | { |
| 214 | .name = "LDO1", | 214 | .name = "LDO1", |
| 215 | .id = 1, | 215 | .id = 1, |