diff options
Diffstat (limited to 'arch/mips/momentum/ocelot_3')
| -rw-r--r-- | arch/mips/momentum/ocelot_3/irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/momentum/ocelot_3/prom.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/momentum/ocelot_3/irq.c b/arch/mips/momentum/ocelot_3/irq.c index 87c63c340ae..793782a9c19 100644 --- a/arch/mips/momentum/ocelot_3/irq.c +++ b/arch/mips/momentum/ocelot_3/irq.c @@ -54,7 +54,7 @@ #include <asm/system.h> static struct irqaction cascade_mv64340 = { - no_action, SA_INTERRUPT, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL + no_action, IRQF_DISABLED, CPU_MASK_NONE, "MV64340-Cascade", NULL, NULL }; void __init arch_init_irq(void) diff --git a/arch/mips/momentum/ocelot_3/prom.c b/arch/mips/momentum/ocelot_3/prom.c index 9803daa2a79..296d945bc24 100644 --- a/arch/mips/momentum/ocelot_3/prom.c +++ b/arch/mips/momentum/ocelot_3/prom.c @@ -21,7 +21,6 @@ * Author: Manish Lachwani, mlachwani@mvista.com * */ -#include <linux/config.h> #include <linux/init.h> #include <linux/bootmem.h> #include <linux/mv643xx.h> |