Messages in this thread | | | Date | Fri, 1 Nov 2013 17:30:03 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the leds tree with the powerpc tree |
| |
Hi Bryan,
Today's linux-next merge of the leds tree got a conflict in include/linux/of.h between commit a3e31b458844 ("of: Move definition of of_find_next_cache_node into common code") from the powerpc tree and commit 954e04b9491a ("of: introduce of_get_available_child_count") from the leds tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/of.h index 2567ccd32482,54c25606a997..000000000000 --- a/include/linux/of.h +++ b/include/linux/of.h @@@ -228,8 -226,17 +228,19 @@@ static inline int of_get_child_count(co return num; } + static inline int of_get_available_child_count(const struct device_node *np) + { + struct device_node *child; + int num = 0; + + for_each_available_child_of_node(np, child) + num++; + + return num; + } + +/* cache lookup */ +extern struct device_node *of_find_next_cache_node(const struct device_node *); extern struct device_node *of_find_node_with_property( struct device_node *from, const char *prop_name); #define for_each_node_with_property(dn, prop_name) \ [unhandled content-type:application/pgp-signature] | |