[PATCH] Allow an arch to expand node boundaries

[powerpc.git] / include / asm-powerpc / i8259.h

diff --git a/include/asm-powerpc/i8259.h b/include/asm-powerpc/i8259.h
index 9521ad4..c80e113 100644 (file)
--- a/include/asm-powerpc/i8259.h
+++ b/include/asm-powerpc/i8259.h
@@ -1,11 +1,16 @@
 #ifndef _ASM_POWERPC_I8259_H
 #define _ASM_POWERPC_I8259_H
+#ifdef __KERNEL__
 
 #include <linux/irq.h>
 
-extern struct hw_interrupt_type i8259_pic;
-
-extern void i8259_init(long intack_addr);
+#ifdef CONFIG_PPC_MERGE
+extern void i8259_init(struct device_node *node, unsigned long intack_addr);
+extern unsigned int i8259_irq(struct pt_regs *regs);
+#else
+extern void i8259_init(unsigned long intack_addr, int offset);
 extern int i8259_irq(struct pt_regs *regs);
+#endif
 
+#endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_I8259_H */