Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / mips / kernel / irq-mv6434x.c

diff --git a/arch/mips/kernel/irq-mv6434x.c b/arch/mips/kernel/irq-mv6434x.c
index 1ed5ae5..0613f1f 100644 (file)
--- a/arch/mips/kernel/irq-mv6434x.c
+++ b/arch/mips/kernel/irq-mv6434x.c
@@ -11,12 +11,14 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <asm/ptrace.h>
-#include <linux/sched.h>
 #include <linux/kernel_stat.h>
+#include <linux/mv643xx.h>
+#include <linux/sched.h>
+
+#include <asm/ptrace.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/mv64340.h>
+#include <asm/marvell.h>
 
 static unsigned int irq_base;
 
@@ -44,7 +46,7 @@ static inline void mask_mv64340_irq(unsigned int irq)
                MV_WRITE(MV64340_INTERRUPT0_MASK_0_LOW, value);
        } else {
                value = MV_READ(MV64340_INTERRUPT0_MASK_0_HIGH);
-               value &= ~(1 << (irq - (irq_base - 32)));
+               value &= ~(1 << (irq - irq_base - 32));
                MV_WRITE(MV64340_INTERRUPT0_MASK_0_HIGH, value);
        }
 }
@@ -60,7 +62,7 @@ static inline void unmask_mv64340_irq(unsigned int irq)
                MV_WRITE(MV64340_INTERRUPT0_MASK_0_LOW, value);
        } else {
                value = MV_READ(MV64340_INTERRUPT0_MASK_0_HIGH);
-               value |= 1 << (irq - (irq_base - 32));
+               value |= 1 << (irq - irq_base - 32);
                MV_WRITE(MV64340_INTERRUPT0_MASK_0_HIGH, value);
        }
 }
@@ -135,14 +137,13 @@ void ll_mv64340_irq(struct pt_regs *regs)
 #define shutdown_mv64340_irq   disable_mv64340_irq
 
 struct hw_interrupt_type mv64340_irq_type = {
-       "MV-64340",
-       startup_mv64340_irq,
-       shutdown_mv64340_irq,
-       enable_mv64340_irq,
-       disable_mv64340_irq,
-       mask_and_ack_mv64340_irq,
-       end_mv64340_irq,
-       NULL
+       .typename = "MV-64340",
+       .startup = startup_mv64340_irq,
+       .shutdown = shutdown_mv64340_irq,
+       .enable = enable_mv64340_irq,
+       .disable = disable_mv64340_irq,
+       .ack = mask_and_ack_mv64340_irq,
+       .end = end_mv64340_irq,
 };
 
 void __init mv64340_irq_init(unsigned int base)