Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge

1 files changed, 18 insertions, 0 deletions

diff --git a/include/linux/of.h b/include/linux/of.h
index 758899d4902b..4386c5fee57c 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -207,6 +207,11 @@ extern int of_property_read_u64(const struct device_node *np,
 extern int of_property_read_string(struct device_node *np,
                                    const char *propname,
                                    const char **out_string);
+extern int of_property_read_string_index(struct device_node *np,
+                                         const char *propname,
+                                         int index, const char **output);
+extern int of_property_count_strings(struct device_node *np,
+                                     const char *propname);
 extern int of_device_is_compatible(const struct device_node *device,
                                    const char *);
 extern int of_device_is_available(const struct device_node *device);
@@ -283,6 +288,19 @@ static inline int of_property_read_string(struct device_node *np,
         return -ENOSYS;
 }
 
+static inline int of_property_read_string_index(struct device_node *np,
+                                                const char *propname, int index,
+                                                const char **out_string)
+{
+        return -ENOSYS;
+}
+
+static inline int of_property_count_strings(struct device_node *np,
+                                            const char *propname)
+{
+        return -ENOSYS;
+}
+
 static inline const void *of_get_property(const struct device_node *node,
                                 const char *name,
                                 int *lenp)