[PATCH] Q40/Q60 IRQ updates from 2.4.x

Q40/Q60 IRQ updates from 2.4.x

include/asm-m68k/q40ints.h

@@ -11,19 +11,19 @@
 
 /* masks for interrupt regiosters*/
 /* internal, IIRQ_REG */
-#define IRQ_KEYB_MASK    (2)
-#define IRQ_SER_MASK     (1<<2)
-#define IRQ_FRAME_MASK   (1<<3)
-#define IRQ_EXT_MASK     (1<<4)    /* is a EIRQ */
+#define Q40_IRQ_KEYB_MASK    (2)
+#define Q40_IRQ_SER_MASK     (1<<2)
+#define Q40_IRQ_FRAME_MASK   (1<<3)
+#define Q40_IRQ_EXT_MASK     (1<<4)    /* is a EIRQ */
 /* eirq, EIRQ_REG */
-#define IRQ3_MASK        (1)
-#define IRQ4_MASK        (1<<1)
-#define IRQ5_MASK        (1<<2)
-#define IRQ6_MASK        (1<<3)
-#define IRQ7_MASK        (1<<4)
-#define IRQ10_MASK       (1<<5)
-#define IRQ14_MASK       (1<<6)
-#define IRQ15_MASK       (1<<7)
+#define Q40_IRQ3_MASK        (1)
+#define Q40_IRQ4_MASK        (1<<1)
+#define Q40_IRQ5_MASK        (1<<2)
+#define Q40_IRQ6_MASK        (1<<3)
+#define Q40_IRQ7_MASK        (1<<4)
+#define Q40_IRQ10_MASK       (1<<5)
+#define Q40_IRQ14_MASK       (1<<6)
+#define Q40_IRQ15_MASK       (1<<7)
 
 extern unsigned long q40_probe_irq_on (void);
 extern int q40_probe_irq_off (unsigned long irqs);

include/asm-m68k/rtc.h

@@ -17,10 +17,6 @@
 
 /* a few implementation details for the emulation : */
 
-extern unsigned gen_rtc_irq_flags; /* which sort(s) of interrupts caused int */
-extern unsigned gen_rtc_irq_ctrl;  /*                             are enabled */
-extern short q40rtc_oldsecs;
-
 #define RTC_PIE 0x40		/* periodic interrupt enable */
 #define RTC_AIE 0x20		/* alarm interrupt enable */
 #define RTC_UIE 0x10		/* update-finished interrupt enable */