summaryrefslogtreecommitdiff
path: root/arch/mips/lantiq
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-01-11 15:41:47 +0100
committerRalf Baechle <ralf@linux-mips.org>2012-01-11 15:41:47 +0100
commit39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch)
tree89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/lantiq
parent5b0ec2efb7d373faa7b1a7632c459b93895d45cd (diff)
parentd7a887a73dec6c387b02a966a71aac767bbd9ce6 (diff)
downloadlinux-3.10-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.tar.gz
linux-3.10-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.tar.bz2
linux-3.10-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.zip
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/lantiq')
-rw-r--r--arch/mips/lantiq/irq.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
index 51fa0a4ba55..d673731c538 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",
};