diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 12:30:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 12:30:21 +0100 |
| commit | 1474e4dbcae04125ed6e503eadcef266846f4675 (patch) | |
| tree | b65a1fb53b4c3c2fb669883faf0b87166b45baaf /drivers/regulator/wm8350-regulator.c | |
| parent | f604c10cdeba4e068afa96be2bee878fb5227f8b (diff) | |
| parent | 09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff) | |
| download | blackbird-op-linux-1474e4dbcae04125ed6e503eadcef266846f4675.tar.gz blackbird-op-linux-1474e4dbcae04125ed6e503eadcef266846f4675.zip | |
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/wm8350-regulator.c')
| -rw-r--r-- | drivers/regulator/wm8350-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index ab1e183a74b5..552b1edf8091 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c @@ -1269,7 +1269,7 @@ static struct regulator_ops wm8350_isink_ops = { .enable_time = wm8350_isink_enable_time, }; -static struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = { +static const struct regulator_desc wm8350_reg[NUM_WM8350_REGULATORS] = { { .name = "DCDC1", .id = WM8350_DCDC_1, |
