diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 14:41:47 (GMT) |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 14:41:47 (GMT) |
commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/lantiq/irq.c | |
parent | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (diff) | |
parent | d7a887a73dec6c387b02a966a71aac767bbd9ce6 (diff) | |
download | linux-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.tar.xz |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/lantiq/irq.c')
-rw-r--r-- | arch/mips/lantiq/irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c index 51fa0a4..d673731 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c @@ -240,7 +240,6 @@ out: static struct irqaction cascade = { .handler = no_action, - .flags = IRQF_DISABLED, .name = "cascade", }; |