Merge remote-tracking branches 'regulator/topic/max1586', 'regulator/topic/max77802' and 'regulator/topic/of' into regulator-next

2014-09-30 13:50:29 +01:00
parent a81bf3c4fc 5ccedf0342 da0bb557ba ef126a4a81
commit 64b285ad7b
8 changed files with 767 additions and 3 deletions
--- a/include/linux/regulator/max1586.h
+++ b/include/linux/regulator/max1586.h
@@ -40,7 +40,7 @@
 */
 struct max1586_subdev_data {
 	int				id;
-	char				*name;
+	const char			*name;
 	struct regulator_init_data	*platform_data;
 };