Pull asus into release branch

[pandora-kernel.git] / arch / mips / sni / pcit.c

diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c
index 3921096..1dfc3f0 100644 (file)
--- a/arch/mips/sni/pcit.c
+++ b/arch/mips/sni/pcit.c
@@ -271,30 +271,30 @@ static void pcit_hwint0(void)
 
 static void sni_pcit_hwint(void)
 {
-       u32 pending = (read_c0_cause() & read_c0_status());
+       u32 pending = read_c0_cause() & read_c0_status();
 
        if (pending & C_IRQ1)
                pcit_hwint1();
        else if (pending & C_IRQ2)
-               do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 4);
+               do_IRQ (MIPS_CPU_IRQ_BASE + 4);
        else if (pending & C_IRQ3)
-               do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 5);
+               do_IRQ (MIPS_CPU_IRQ_BASE + 5);
        else if (pending & C_IRQ5)
-               do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 7);
+               do_IRQ (MIPS_CPU_IRQ_BASE + 7);
 }
 
 static void sni_pcit_hwint_cplus(void)
 {
-       u32 pending = (read_c0_cause() & read_c0_status());
+       u32 pending = read_c0_cause() & read_c0_status();
 
        if (pending & C_IRQ0)
                pcit_hwint0();
        else if (pending & C_IRQ2)
-               do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 4);
+               do_IRQ (MIPS_CPU_IRQ_BASE + 4);
        else if (pending & C_IRQ3)
-               do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 5);
+               do_IRQ (MIPS_CPU_IRQ_BASE + 5);
        else if (pending & C_IRQ5)
-               do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 7);
+               do_IRQ (MIPS_CPU_IRQ_BASE + 7);
 }
 
 void __init sni_pcit_irq_init(void)