diff --git a/[refs] b/[refs] index 3826d268a8c5..702fede60443 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36a0904ea0a657567122edebb95eab5f1620a5eb +refs/heads/master: 5762c20593b6b959f1470dc6f1ff4ca4d9570f8d diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h index 736b7477beb2..92c40a142243 100644 --- a/trunk/include/linux/of.h +++ b/trunk/include/linux/of.h @@ -303,6 +303,7 @@ static inline struct device_node *of_parse_phandle(struct device_node *np, } #define of_match_ptr(_ptr) NULL +#define of_match_node(_matches, _node) NULL #endif /* CONFIG_OF */ static inline int of_property_read_u32(const struct device_node *np,