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

diff --combined include/linux/of.h
index 758899d4902bc1956d11ecd8d6a549144eee4a79,f01ba8a209c0b9fc573b6bdad85ae7b3196f10bd..4386c5fee57ca730ef43809e484441a12c54c0c0
--- 1/include/linux/of.h
--- 2/include/linux/of.h
+++ b/include/linux/of.h
@@@ -207,6 -207,11 +207,11 @@@ extern int of_property_read_u64(const s
  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 +288,19 @@@ static inline int of_property_read_stri
        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)
@@@ -303,11 -321,6 +321,11 @@@ static inline struct device_node *of_pa
        return NULL;
  }
  
 +static inline int of_alias_get_id(struct device_node *np, const char *stem)
 +{
 +      return -ENOSYS;
 +}
 +
  #define of_match_ptr(_ptr)    NULL
  #define of_match_node(_matches, _node)        NULL
  #endif /* CONFIG_OF */