summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichael Opdenacker <michael@free-electrons.com>2014-03-04 21:51:44 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-03-12 10:32:29 +0000
commit57c06a8ed7db71e14a4388590ad258c5b557e557 (patch)
treec0f0bf0f4d9a33f11e921b796259a53ffb84f9f9 /arch
parent26632becc3c126599567d7fec69c9d91cf3dc124 (diff)
downloadlinux-stable-57c06a8ed7db71e14a4388590ad258c5b557e557.tar.gz
linux-stable-57c06a8ed7db71e14a4388590ad258c5b557e557.tar.bz2
linux-stable-57c06a8ed7db71e14a4388590ad258c5b557e557.zip
ARM: 7996/1: floppy.h: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag in arch/arm/include/asm/floppy.h 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: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/floppy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h
index c9f03eccc9d8..f4882553fbb0 100644
--- a/arch/arm/include/asm/floppy.h
+++ b/arch/arm/include/asm/floppy.h
@@ -25,7 +25,7 @@
#define fd_inb(port) inb((port))
#define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\
- IRQF_DISABLED,"floppy",NULL)
+ 0,"floppy",NULL)
#define fd_free_irq() free_irq(IRQ_FLOPPYDISK,NULL)
#define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK)
#define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK)