cpumask: introduce new API, without changing anything, v3

[linux-2.6-omap-h63xx.git] / include / asm-m68k / amigaints.h

diff --git a/include/asm-m68k/amigaints.h b/include/asm-m68k/amigaints.h
index 576f5d1b57066325006545b3e1ca6f38e4acfa2c..b1bcdb835ab9a61cf2170466284535e98fb4f3ce 100644 (file)
--- a/include/asm-m68k/amigaints.h
+++ b/include/asm-m68k/amigaints.h
@@ -37,8 +37,8 @@
 #define IRQ_AMIGA_SOFT         (IRQ_USER+2)
 
 /* interrupts from external hardware */
-#define IRQ_AMIGA_PORTS                (IRQ_USER+3)
-#define IRQ_AMIGA_EXTER                (IRQ_USER+13)
+#define IRQ_AMIGA_PORTS                IRQ_AUTO_2
+#define IRQ_AMIGA_EXTER                IRQ_AUTO_6
 
 /* copper interrupt */
 #define IRQ_AMIGA_COPPER       (IRQ_USER+4)
@@ -88,9 +88,6 @@
 #define IF_DSKBLK   0x0002     /* diskblock DMA finished */
 #define IF_TBE     0x0001      /* serial transmit buffer empty interrupt */
 
-extern void amiga_do_irq(int irq, struct pt_regs *fp);
-extern void amiga_do_irq_list(int irq, struct pt_regs *fp);
-
 /* CIA interrupt control register bits */
 
 #define CIA_ICR_TA     0x01
@@ -101,12 +98,15 @@ extern void amiga_do_irq_list(int irq, struct pt_regs *fp);
 #define CIA_ICR_ALL    0x1f
 #define CIA_ICR_SETCLR 0x80
 
+extern void amiga_init_IRQ(void);
+
 /* to access the interrupt control registers of CIA's use only
 ** these functions, they behave exactly like the amiga os routines
 */
 
 extern struct ciabase ciaa_base, ciab_base;
 
+extern void cia_init_IRQ(struct ciabase *base);
 extern unsigned char cia_set_irq(struct ciabase *base, unsigned char mask);
 extern unsigned char cia_able_irq(struct ciabase *base, unsigned char mask);