diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:16 +0100 |
| commit | 6979380d85fd9e1ff701021206b315fcd66b510e (patch) | |
| tree | 8f230b8404cafdcfafba44bf97210c94ee963f92 /include | |
| parent | Merge remote-tracking branch 'regulator/topic/lp8755' into regulator-next (diff) | |
| parent | regulator: max8660: fix build warnings (diff) | |
| download | linux-dev-6979380d85fd9e1ff701021206b315fcd66b510e.tar.xz linux-dev-6979380d85fd9e1ff701021206b315fcd66b510e.zip | |
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regulator/max8660.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/regulator/max8660.h b/include/linux/regulator/max8660.h index 9936763621c7..f8a6a4844864 100644 --- a/include/linux/regulator/max8660.h +++ b/include/linux/regulator/max8660.h @@ -39,7 +39,7 @@ enum { */ struct max8660_subdev_data { int id; - char *name; + const char *name; struct regulator_init_data *platform_data; }; |