diff --git a/[refs] b/[refs] index ab291e7d7a5b..9c78e12fac5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14cd3c15cfc8118586262a79bfa3b3123f13e2c2 +refs/heads/master: 29f141fed01a09050207c4d41fc5811520d81146 diff --git a/trunk/arch/arm/boot/.gitignore b/trunk/arch/arm/boot/.gitignore index ce1c5ff746e7..3c79f85975aa 100644 --- a/trunk/arch/arm/boot/.gitignore +++ b/trunk/arch/arm/boot/.gitignore @@ -3,3 +3,4 @@ zImage xipImage bootpImage uImage +*.dtb diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h index a75a831e2057..92cf6ad35e0e 100644 --- a/trunk/include/linux/of.h +++ b/trunk/include/linux/of.h @@ -281,6 +281,14 @@ static inline struct property *of_find_property(const struct device_node *np, return NULL; } +static inline struct device_node *of_find_compatible_node( + struct device_node *from, + const char *type, + const char *compat) +{ + return NULL; +} + static inline int of_property_read_u32_array(const struct device_node *np, const char *propname, u32 *out_values, size_t sz)