X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-powerpc%2Fi8259.h;fp=include%2Fasm-powerpc%2Fi8259.h;h=0392159e16e4f9cbd3b1c99519a858bf505755e8;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=c80e113052cd3a3da7b3f0d1f065898de6428b78;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-powerpc/i8259.h b/include/asm-powerpc/i8259.h
index c80e11305..0392159e1 100644
--- a/include/asm-powerpc/i8259.h
+++ b/include/asm-powerpc/i8259.h
@@ -4,13 +4,11 @@
 
 #include <linux/irq.h>
 
-#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 struct hw_interrupt_type i8259_pic;
+
 extern void i8259_init(unsigned long intack_addr, int offset);
 extern int i8259_irq(struct pt_regs *regs);
-#endif
+extern int i8259_irq_cascade(struct pt_regs *regs, void *unused);
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_I8259_H */