h8300: IRQ handling update

[sfrench/cifs-2.6.git] / include / asm-h8300 / irq.h

diff --git a/include/asm-h8300/irq.h b/include/asm-h8300/irq.h
index 41be646c351403615810d80a2d185033d63c9e7a..13d7c601cd0a1f5a4ed41348b69e6af4495ff7cf 100644 (file)
--- a/include/asm-h8300/irq.h
+++ b/include/asm-h8300/irq.h
@@ -3,7 +3,7 @@
 
 #include <asm/ptrace.h>
 
-#if defined(__H8300H__)
+#if defined(CONFIG_CPU_H8300H)
 #define NR_IRQS 64
 #define EXT_IRQ0 12
 #define EXT_IRQ1 13
@@ -14,14 +14,6 @@
 #define EXT_IRQ6 18
 #define EXT_IRQ7 19
 #define EXT_IRQS 5
-
-#include <asm/regs306x.h>
-#define h8300_clear_isr(irq)                                                \
-do {                                                                        \
-       if (irq >= EXT_IRQ0 && irq <= EXT_IRQ5)                             \
-               *(volatile unsigned char *)ISR &= ~(1 << (irq - EXT_IRQ0)); \
-} while(0)
-
 #define IER_REGS *(volatile unsigned char *)IER
 #endif
 #if defined(CONFIG_CPU_H8S)
@@ -44,13 +36,6 @@ do {                                                                        \
 #define EXT_IRQ15 31
 #define EXT_IRQS 15
 
-#include <asm/regs267x.h>
-#define h8300_clear_isr(irq)                                                 \
-do {                                                                         \
-       if (irq >= EXT_IRQ0 && irq <= EXT_IRQ15)                             \
-               *(volatile unsigned short *)ISR &= ~(1 << (irq - EXT_IRQ0)); \
-} while(0)
-
 #define IER_REGS *(volatile unsigned short *)IER
 #endif
 
@@ -59,7 +44,6 @@ static __inline__ int irq_canonicalize(int irq)
        return irq;
 }
 
-extern void enable_irq(unsigned int);
-extern void disable_irq(unsigned int);
+typedef void (*h8300_vector)(void);
 
 #endif /* _H8300_IRQ_H_ */