summaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 16:50:16 +0400
committerMark Brown <broonie@linaro.org>2013-09-01 16:50:16 +0400
commit6979380d85fd9e1ff701021206b315fcd66b510e (patch)
tree8f230b8404cafdcfafba44bf97210c94ee963f92 /include/linux/regulator
parent3aba952706c2f1e5f05987be0cda716ecf2b5d55 (diff)
parentd6c7e1139591b9ba7c4ad9c5eec748f0a68ad212 (diff)
downloadlinux-6979380d85fd9e1ff701021206b315fcd66b510e.tar.xz
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Diffstat (limited to 'include/linux/regulator')
-rw-r--r--include/linux/regulator/max8660.h2
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;
};