Merge remote-tracking branch 'regulator/topic/core' into regulator-next

2014-06-02 17:08:02 +01:00
parent dc49f3d5eb 69c3f7239e
commit 42398dbdea
4 changed files with 36 additions and 30 deletions
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -63,7 +63,7 @@ struct mfd_cell {
 	/* A list of regulator supplies that should be mapped to the MFD
 	 * device rather than the child device when requested
 	 */
-	const char		**parent_supplies;
+	const char * const	*parent_supplies;
 	int			num_parent_supplies;
 };