Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index a11d68976dc8..8c1335566089 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -734,10 +734,7 @@ void of_irq_map_init(unsigned int flags)
         if (flags & OF_IMAP_NO_PHANDLE) {
                 struct device_node *np;
 
-                for(np = NULL; (np = of_find_all_nodes(np)) != NULL;) {
-                        if (of_get_property(np, "interrupt-controller", NULL)
-                            == NULL)
-                                continue;
+                for_each_node_with_property(np, "interrupt-controller") {
                         /* Skip /chosen/interrupt-controller */
                         if (strcmp(np->name, "chosen") == 0)
                                 continue;