diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:41:47 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 15:41:47 +0100 |
| commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
| tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/sni/irq.c | |
| parent | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (diff) | |
| parent | d7a887a73dec6c387b02a966a71aac767bbd9ce6 (diff) | |
| download | op-kernel-dev-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.zip op-kernel-dev-39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f.tar.gz | |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/sni/irq.c')
| -rw-r--r-- | arch/mips/sni/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c index e8e72bb..5a4ec75 100644 --- a/arch/mips/sni/irq.c +++ b/arch/mips/sni/irq.c @@ -42,7 +42,7 @@ static irqreturn_t sni_isa_irq_handler(int dummy, void *p) struct irqaction sni_isa_irq = { .handler = sni_isa_irq_handler, .name = "ISA", - .flags = IRQF_SHARED | IRQF_DISABLED + .flags = IRQF_SHARED }; /* |
