- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / arch / h8300 / kernel / irq.c

diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c
index 8dec4dd..ef4f004 100644 (file)
--- a/arch/h8300/kernel/irq.c
+++ b/arch/h8300/kernel/irq.c
@@ -14,6 +14,7 @@
 #include <linux/random.h>
 #include <linux/bootmem.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 
 #include <asm/system.h>
 #include <asm/traps.h>
@@ -25,7 +26,7 @@
 
 extern unsigned long *interrupt_redirect_table;
 extern const int h8300_saved_vectors[];
-extern const unsigned long h8300_trap_table[];
+extern const h8300_vector h8300_trap_table[];
 int h8300_enable_irq_pin(unsigned int irq);
 void h8300_disable_irq_pin(unsigned int irq);
 
@@ -115,7 +116,7 @@ static void __init setup_vector(void)
 {
        int i;
        unsigned long *ramvec,*ramvec_p;
-       const unsigned long *trap_entry;
+       const h8300_vector *trap_entry;
        const int *saved_vector;
 
        ramvec = get_vector_address();