aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/sun3xflop.h
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-09-07 07:43:08 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-09-26 09:54:16 +0200
commit77a42796786c2ea2d3a67262fb5f1f707c3e0594 (patch)
treea93f7eac94f0d118ebda42509093b872f7b0efd0 /arch/m68k/include/asm/sun3xflop.h
parent21e884bafa039fab0facd327c9380b58151e73f2 (diff)
m68k: Remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from m68k architecture code. It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/sun3xflop.h')
-rw-r--r--arch/m68k/include/asm/sun3xflop.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/sun3xflop.h b/arch/m68k/include/asm/sun3xflop.h
index 95231e2f9d64..a02ea3a7bb20 100644
--- a/arch/m68k/include/asm/sun3xflop.h
+++ b/arch/m68k/include/asm/sun3xflop.h
@@ -207,7 +207,7 @@ static int sun3xflop_request_irq(void)
if(!once) {
once = 1;
error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,
- IRQF_DISABLED, "floppy", NULL);
+ 0, "floppy", NULL);
return ((error == 0) ? 0 : -1);
} else return 0;
}