Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[mv-sheeva.git] / arch / sparc / kernel / prom_common.c

diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
index 95e8e5d1b0fbaf2eb213e392aacb6271af17f2d9..ff7b591c8946d1ad5f849f0956e4452037f78e66 100644 (file)
--- a/arch/sparc/kernel/prom_common.c
+++ b/arch/sparc/kernel/prom_common.c
@@ -25,6 +25,15 @@
 
 #include "prom.h"
 
+struct device_node *of_console_device;
+EXPORT_SYMBOL(of_console_device);
+
+char *of_console_path;
+EXPORT_SYMBOL(of_console_path);
+
+char *of_console_options;
+EXPORT_SYMBOL(of_console_options);
+
 struct device_node *of_find_node_by_phandle(phandle handle)
 {
        struct device_node *np;
@@ -146,20 +155,12 @@ static struct property * __init build_one_prop(phandle node, char *prev,
                p->value = prom_early_alloc(special_len);
                memcpy(p->value, special_val, special_len);
        } else {
-#ifdef CONFIG_SPARC32
                if (prev == NULL) {
-                       name = prom_firstprop(node, NULL);
+                       name = prom_firstprop(node, p->name);
                } else {
-                       name = prom_nextprop(node, prev, NULL);
+                       name = prom_nextprop(node, prev, p->name);
                }
-#else
-               if (prev == NULL) {
-                       prom_firstprop(node, p->name);
-               } else {
-                       prom_nextprop(node, prev, p->name);
-               }
-               name = p->name;
-#endif
+
                if (strlen(name) == 0) {
                        tmp = p;
                        return NULL;
@@ -234,10 +235,10 @@ static struct device_node * __init prom_create_node(phandle node,
        dp->type = get_one_property(node, "device_type");
        dp->node = node;
 
-       /* Build interrupts later... */
-
        dp->properties = build_prop_list(node);
 
+       irq_trans_init(dp);
+
        return dp;
 }