1 files changed, 8 insertions, 2 deletions

diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 0fb5789d43c8..138910c67206 100644
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -22,9 +22,12 @@
 #include <linux/of.h>
 #include <asm/prom.h>
 #include <asm/oplib.h>
+#include <asm/leon.h>
 
 #include "prom.h"
 
+void (*prom_build_more)(struct device_node *dp, struct device_node ***nextp);
+
 struct device_node *of_console_device;
 EXPORT_SYMBOL(of_console_device);
 
@@ -161,7 +164,7 @@ static struct property * __init build_one_prop(phandle node, char *prev,
                         name = prom_nextprop(node, prev, p->name);
                 }
 
-                if (strlen(name) == 0) {
+                if (!name || strlen(name) == 0) {
                         tmp = p;
                         return NULL;
                 }
@@ -242,7 +245,7 @@ static struct device_node * __init prom_create_node(phandle node,
         return dp;
 }
 
-static char * __init build_full_name(struct device_node *dp)
+char * __init build_full_name(struct device_node *dp)
 {
         int len, ourlen, plen;
         char *n;
@@ -289,6 +292,9 @@ static struct device_node * __init prom_build_tree(struct device_node *parent,
 
                 dp->child = prom_build_tree(dp, prom_getchild(node), nextp);
 
+                if (prom_build_more)
+                        prom_build_more(dp, nextp);
+
                 node = prom_getsibling(node);
         }