diff --git a/[refs] b/[refs] index f94dbbc7cc88..3826d268a8c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b3754d6183797263bc6b28884323cf7842a8961 +refs/heads/master: 36a0904ea0a657567122edebb95eab5f1620a5eb diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h index 1cc9930ba06a..736b7477beb2 100644 --- a/trunk/include/linux/of.h +++ b/trunk/include/linux/of.h @@ -255,6 +255,12 @@ static inline bool of_have_populated_dt(void) #define for_each_child_of_node(parent, child) \ while (0) +static inline int of_device_is_compatible(const struct device_node *device, + const char *name) +{ + return 0; +} + static inline struct property *of_find_property(const struct device_node *np, const char *name, int *lenp) @@ -289,6 +295,13 @@ static inline int of_property_read_u64(const struct device_node *np, return -ENOSYS; } +static inline struct device_node *of_parse_phandle(struct device_node *np, + const char *phandle_name, + int index) +{ + return NULL; +} + #define of_match_ptr(_ptr) NULL #endif /* CONFIG_OF */