Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-mips / i8259.h

diff --git a/include/asm-mips/i8259.h b/include/asm-mips/i8259.h
index e88a01607feab6ae9b9fbfa0d109dae1dae04d9d..8572a2d90484946c539ab48c585755bb8594ac4e 100644 (file)
--- a/include/asm-mips/i8259.h
+++ b/include/asm-mips/i8259.h
@@ -37,9 +37,8 @@
 
 extern spinlock_t i8259A_lock;
 
-extern void init_8259A(int auto_eoi);
-extern void enable_8259A_irq(unsigned int irq);
-extern void disable_8259A_irq(unsigned int irq);
+extern int i8259A_irq_pending(unsigned int irq);
+extern void make_8259A_irq(unsigned int irq);
 
 extern void init_i8259_irqs(void);