From 7e6edc1b4efb8c9076b9d93a7e15691ac5e92618 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 7 Dec 2008 00:46:33 -0800
Subject: [PATCH] --- yaml --- r: 123384 b: refs/heads/master c:
 bf944c370ab181ada51c0754a2d13ae8543b149a h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sparc/kernel/prom.h        | 3 ---
 trunk/arch/sparc/kernel/prom_32.c     | 4 ++++
 trunk/arch/sparc/kernel/prom_common.c | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4ed5646300c1..884ac59f10f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d34dd82905fb8e1117b67ab6c32989f88cfa0ba8
+refs/heads/master: bf944c370ab181ada51c0754a2d13ae8543b149a
diff --git a/trunk/arch/sparc/kernel/prom.h b/trunk/arch/sparc/kernel/prom.h
index 0764b354b52c..bb0f0fda6cab 100644
--- a/trunk/arch/sparc/kernel/prom.h
+++ b/trunk/arch/sparc/kernel/prom.h
@@ -8,10 +8,7 @@ extern struct device_node *allnodes;	/* temporary while merging */
 extern rwlock_t devtree_lock;	/* temporary while merging */
 
 extern void * prom_early_alloc(unsigned long size);
-
-#ifdef CONFIG_SPARC64
 extern void irq_trans_init(struct device_node *dp);
-#endif
 
 extern unsigned int prom_unique_id;
 
diff --git a/trunk/arch/sparc/kernel/prom_32.c b/trunk/arch/sparc/kernel/prom_32.c
index f21e8fc9a8fb..fe43e80772db 100644
--- a/trunk/arch/sparc/kernel/prom_32.c
+++ b/trunk/arch/sparc/kernel/prom_32.c
@@ -289,3 +289,7 @@ void __init of_console_init(void)
 void __init of_fill_in_cpu_data(void)
 {
 }
+
+void __init irq_trans_init(struct device_node *dp)
+{
+}
diff --git a/trunk/arch/sparc/kernel/prom_common.c b/trunk/arch/sparc/kernel/prom_common.c
index 2736f3d74c7f..4e9af593db49 100644
--- a/trunk/arch/sparc/kernel/prom_common.c
+++ b/trunk/arch/sparc/kernel/prom_common.c
@@ -243,10 +243,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;
 }