Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / mips / lasat / interrupt.c

diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
index 9a622b9a105161bddcd068c3c9eedc55a25c8da6..5f35289bfff58b30232e6913756eed2bbcf48a3e 100644 (file)
--- a/arch/mips/lasat/interrupt.c
+++ b/arch/mips/lasat/interrupt.c
@@ -19,19 +19,19 @@
  * Lasat boards.
  */
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 
 #include <asm/bootinfo.h>
-#include <asm/irq.h>
 #include <asm/lasat/lasatint.h>
 #include <asm/time.h>
 #include <asm/gdb-stub.h>
 
-static volatile int *lasat_int_status = NULL;
-static volatile int *lasat_int_mask = NULL;
+static volatile int *lasat_int_status;
+static volatile int *lasat_int_mask;
 static volatile int lasat_int_mask_shift;
 
 void disable_lasat_irq(unsigned int irq_nr)
@@ -65,7 +65,7 @@ static inline int ls1bit32(unsigned int x)
        return b;
 }
 
-static unsigned long (* get_int_status)(void);
+static unsigned long (*get_int_status)(void);
 
 static unsigned long get_int_status_100(void)
 {