From 5a48f8ee4cce4c19cf58dd36a9ac371b88568796 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 14 Oct 2011 13:36:04 +0100
Subject: [PATCH] --- yaml --- r: 272418 b: refs/heads/master c:
 0151546fb34e92494acd65ed84a603c2a4a90168 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/include/linux/regulator/machine.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 58ccb010722d..49fe1ca6cd42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1685e4e2c3854782272f32b71f2f3eff5c6e0d0
+refs/heads/master: 0151546fb34e92494acd65ed84a603c2a4a90168
diff --git a/trunk/include/linux/regulator/machine.h b/trunk/include/linux/regulator/machine.h
index ce3127a75c88..f3f13fd5868f 100644
--- a/trunk/include/linux/regulator/machine.h
+++ b/trunk/include/linux/regulator/machine.h
@@ -95,7 +95,7 @@ struct regulator_state {
  */
 struct regulation_constraints {
 
-	char *name;
+	const char *name;
 
 	/* voltage output range (inclusive) - for voltage control */
 	int min_uV;