diff --git a/[refs] b/[refs]
index e5504a3db353..c06b5133816c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 783c98b911fce8d47aa2906468ca39d44d46d7ce
+refs/heads/master: 51e0f004a9ab9104acbe323c0b20e0279bf9be85
diff --git a/trunk/arch/sparc/include/asm/prom.h b/trunk/arch/sparc/include/asm/prom.h
index 58b85fa56066..900d44714f8d 100644
--- a/trunk/arch/sparc/include/asm/prom.h
+++ b/trunk/arch/sparc/include/asm/prom.h
@@ -101,8 +101,10 @@ static inline void of_node_put(struct device_node *node)
  * register them in the of_device objects, whereas powerpc computes them
  * on request.
  */
-extern int irq_of_parse_and_map(struct device_node *node, int index);
-#define irq_dispose_mapping(irq) do { } while (0)
+extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
+static inline void irq_dispose_mapping(unsigned int virq)
+{
+}
 
 /*
  * NB:  This is here while we transition from using asm/prom.h
diff --git a/trunk/arch/sparc/kernel/of_device.c b/trunk/arch/sparc/kernel/of_device.c
index 56e9a718ef8f..aace71f7d6e5 100644
--- a/trunk/arch/sparc/kernel/of_device.c
+++ b/trunk/arch/sparc/kernel/of_device.c
@@ -29,12 +29,12 @@ struct of_device *of_find_device_by_node(struct device_node *dp)
 }
 EXPORT_SYMBOL(of_find_device_by_node);
 
-int irq_of_parse_and_map(struct device_node *node, int index)
+unsigned int irq_of_parse_and_map(struct device_node *node, int index)
 {
 	struct of_device *op = of_find_device_by_node(node);
 
 	if (!op || index >= op->num_irqs)
-		return 0xffffffff;
+		return 0;
 
 	return op->irqs[index];
 }
diff --git a/trunk/arch/sparc64/kernel/of_device.c b/trunk/arch/sparc64/kernel/of_device.c
index 8a0d82343a25..a30f2af0bf2c 100644
--- a/trunk/arch/sparc64/kernel/of_device.c
+++ b/trunk/arch/sparc64/kernel/of_device.c
@@ -55,12 +55,12 @@ struct of_device *of_find_device_by_node(struct device_node *dp)
 }
 EXPORT_SYMBOL(of_find_device_by_node);
 
-int irq_of_parse_and_map(struct device_node *node, int index)
+unsigned int irq_of_parse_and_map(struct device_node *node, int index)
 {
 	struct of_device *op = of_find_device_by_node(node);
 
 	if (!op || index >= op->num_irqs)
-		return 0xffffffff;
+		return 0;
 
 	return op->irqs[index];
 }