Merge branch 'merge'
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index 7a457bd..c15e66a 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -276,6 +276,7 @@
* of_irq_map_raw - Low level interrupt tree parsing
* @parent: the device interrupt parent
* @intspec: interrupt specifier ("interrupts" property of the device)
+ * @ointsize: size of the passed in interrupt specifier
* @addr: address specifier (start of "reg" property of the device)
* @out_irq: structure of_irq filled by this function
*
@@ -289,7 +290,8 @@
*/
extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
- const u32 *addr, struct of_irq *out_irq);
+ u32 ointsize, const u32 *addr,
+ struct of_irq *out_irq);
/**