Merge to Fedora kernel-2.6.7-1.492

[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..cb9d2fe 100644 (file)
--- a/arch/mips/kernel/irq-mv6434x.c
+++ b/arch/mips/kernel/irq-mv6434x.c
@@ -44,7 +44,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 +60,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);
        }
 }