X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-powerpc%2Fi8259.h;h=db1362f8c603c2576dffefbe6e23a8c410057984;hb=40d22c1b5675e428b3f3f9a945d0bd62e94ca2f1;hp=fc4bfee124d7016689b785becfc741f5ae55e60e;hpb=c2cc87ca9561ddfe744d446789cc10f507e87db9;p=powerpc.git

diff --git a/include/asm-powerpc/i8259.h b/include/asm-powerpc/i8259.h
index fc4bfee124..db1362f8c6 100644
--- a/include/asm-powerpc/i8259.h
+++ b/include/asm-powerpc/i8259.h
@@ -1,12 +1,17 @@
 #ifndef _ASM_POWERPC_I8259_H
 #define _ASM_POWERPC_I8259_H
+#ifdef __KERNEL__
 
 #include <linux/irq.h>
 
-extern struct hw_interrupt_type i8259_pic;
-
+#ifdef CONFIG_PPC_MERGE
+extern void i8259_init(struct device_node *node, unsigned long intack_addr);
+extern unsigned int i8259_irq(void);
+extern struct irq_host *i8259_get_host(void);
+#else
 extern void i8259_init(unsigned long intack_addr, int offset);
-extern int i8259_irq(struct pt_regs *regs);
-extern int i8259_irq_cascade(struct pt_regs *regs, void *unused);
+extern int i8259_irq(void);
+#endif
 
+#endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_I8259_H */