diff --git a/[refs] b/[refs] index a339455a07dc..ad7d3cbadeb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aba3dfff9a75eb272c4f47994f16eb5d548a5af1 +refs/heads/master: 3a1e362e3f3cd571b3974b8d44b8e358ec7a098c diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h index 83a61f3b443c..53107b09cbdf 100644 --- a/trunk/include/linux/of.h +++ b/trunk/include/linux/of.h @@ -242,6 +242,7 @@ extern void of_attach_node(struct device_node *); extern void of_detach_node(struct device_node *); #endif +#define of_match_ptr(_ptr) (_ptr) #else /* CONFIG_OF */ static inline bool of_have_populated_dt(void) @@ -280,6 +281,7 @@ static inline const void *of_get_property(const struct device_node *node, return NULL; } +#define of_match_ptr(_ptr) NULL #endif /* CONFIG_OF */ static inline int of_property_read_u32(const struct device_node *np,