diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 15:30:21 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 15:30:21 +0400 |
commit | 1474e4dbcae04125ed6e503eadcef266846f4675 (patch) | |
tree | b65a1fb53b4c3c2fb669883faf0b87166b45baaf /drivers/regulator/max8649.c | |
parent | f604c10cdeba4e068afa96be2bee878fb5227f8b (diff) | |
parent | 09de3473c7724d7a1db7596acc2ce411e5e72f63 (diff) | |
download | linux-1474e4dbcae04125ed6e503eadcef266846f4675.tar.xz |
Merge branch 'regulator-register' into regulator-drivers
Diffstat (limited to 'drivers/regulator/max8649.c')
-rw-r--r-- | drivers/regulator/max8649.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index 2e9ffbec2e3b..dca7835b381c 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c @@ -207,7 +207,7 @@ static struct regulator_ops max8649_dcdc_ops = { }; -static struct regulator_desc dcdc_desc = { +static const struct regulator_desc dcdc_desc = { .name = "max8649", .ops = &max8649_dcdc_ops, .type = REGULATOR_VOLTAGE, |