From 6e65ddb3df84b362a9cd6c968dae8bf49be129e9 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Mon, 4 Jul 2011 09:01:18 +0800 Subject: [PATCH] --- yaml --- r: 256780 b: refs/heads/master c: f09bc831b7693f93ecb95dea7180d55b45b88e76 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/of/base.c | 2 +- trunk/include/linux/of.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cdd169d13643..bc4798de045c 100644 --- 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 index b8b65fddbeb5..57ec27bed44f 100644 --- 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 index 4fc4c1b8d5d5..b23852002b30 100644 --- 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);