summaryrefslogtreecommitdiff
path: root/arch/m68k/include/asm/floppy.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/floppy.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/floppy.h')
-rw-r--r--arch/m68k/include/asm/floppy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/floppy.h b/arch/m68k/include/asm/floppy.h
index 697d50393dd0..47365b1ccbec 100644
--- a/arch/m68k/include/asm/floppy.h
+++ b/arch/m68k/include/asm/floppy.h
@@ -85,7 +85,7 @@ static int fd_request_irq(void)
{
if(MACH_IS_Q40)
return request_irq(FLOPPY_IRQ, floppy_hardint,
- IRQF_DISABLED, "floppy", floppy_hardint);
+ 0, "floppy", floppy_hardint);
else if(MACH_IS_SUN3X)
return sun3xflop_request_irq();
return -ENXIO;