---

yaml --- r: 123384 b: refs/heads/master c: bf944c3 h: refs/heads/master v: v3
git-mirror · Dec 7, 2008 · 7e6edc1 · 7e6edc1
1 parent 61d95c9
commit 7e6edc1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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)
+    {
+    }