h8300: IRQ handling update

[sfrench/cifs-2.6.git] / arch / h8300 / platform / h8s / irq.c

diff --git a/arch/h8300/platform/h8s/ints_h8s.c b/arch/h8300/platform/h8s/irq.c
similarity index 95%
rename from arch/h8300/platform/h8s/ints_h8s.c
rename to arch/h8300/platform/h8s/irq.c
index faa8a459d95268a869208df0b964136e137812c1..8182f041f82956abb8be40d35a7fc5df0c952cfb 100644 (file)
--- a/arch/h8300/platform/h8s/ints_h8s.c
+++ b/arch/h8300/platform/h8s/irq.c
@@ -27,11 +27,11 @@ const int __initdata h8300_saved_vectors[]={
 };
 
 /* trap entry table */
-const unsigned long __initdata h8300_trap_table[NR_TRAPS]={
+const H8300_VECTOR __initdata h8300_trap_table[] = {
        0,0,0,0,0,
-       (unsigned long)trace_break,  /* TRACE */
+       trace_break,  /* TRACE */
        0,0,
-       (unsigned long)system_call,  /* TRAPA #0 */
+       system_call,  /* TRAPA #0 */
        0,0,0,0,0,0,0
 };
 
@@ -50,7 +50,7 @@ static const struct irq_pins irq_assign_table0[16]={
        {H8300_GPIO_P6,H8300_GPIO_B2},{H8300_GPIO_P6,H8300_GPIO_B3},
        {H8300_GPIO_P6,H8300_GPIO_B4},{H8300_GPIO_P6,H8300_GPIO_B5},
        {H8300_GPIO_PF,H8300_GPIO_B1},{H8300_GPIO_PF,H8300_GPIO_B2},
-}; 
+};
 /* ISTR = 1 */
 static const struct irq_pins irq_assign_table1[16]={
        {H8300_GPIO_P8,H8300_GPIO_B0},{H8300_GPIO_P8,H8300_GPIO_B1},