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/max8952.c | |
| parent | f604c10cdeba4e068afa96be2bee878fb5227f8b (diff) | |
| parent | 09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff) | |
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/max8952.c')
| -rw-r--r-- | drivers/regulator/max8952.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c index c35236a06cbb..b4084314c222 100644 --- a/drivers/regulator/max8952.c +++ b/drivers/regulator/max8952.c | |||
| @@ -159,7 +159,7 @@ static struct regulator_ops max8952_ops = { | |||
| 159 | .set_suspend_disable = max8952_disable, | 159 | .set_suspend_disable = max8952_disable, |
| 160 | }; | 160 | }; |
| 161 | 161 | ||
| 162 | static struct regulator_desc regulator = { | 162 | static const struct regulator_desc regulator = { |
| 163 | .name = "MAX8952_VOUT", | 163 | .name = "MAX8952_VOUT", |
| 164 | .id = 0, | 164 | .id = 0, |
| 165 | .n_voltages = MAX8952_NUM_DVS_MODE, | 165 | .n_voltages = MAX8952_NUM_DVS_MODE, |