---

yaml --- r: 256780 b: refs/heads/master c: f09bc83 h: refs/heads/master v: v3
git-mirror · Jul 4, 2011 · 6e65ddb · 6e65ddb
1 parent 469dfbb
commit 6e65ddb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3b853633d78c3930b513ee219df48637ac82eed
+refs/heads/master: f09bc831b7693f93ecb95dea7180d55b45b88e76
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
@@ -639,7 +639,7 @@ EXPORT_SYMBOL_GPL(of_property_read_u32);
  * The out_string pointer is modified only if a valid string can be decoded.
  */
 int of_property_read_string(struct device_node *np, char *propname,
-				char **out_string)
+				const char **out_string)
 {
 	struct property *prop = of_find_property(np, propname, NULL);
 	if (!prop)

diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
@@ -198,7 +198,7 @@ extern struct property *of_find_property(const struct device_node *np,
 extern int of_property_read_u32(struct device_node *np, char *propname,
 					u32 *out_value);
 extern int of_property_read_string(struct device_node *np, char *propname,
-					char **out_string);
+					const char **out_string);
 extern int of_device_is_compatible(const struct device_node *device,
 				   const char *);
 extern int of_device_is_available(const struct device_node *device);