diff options
| author |   Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-09-07 07:43:08 +0200 |
|---|---|---|
| committer |   Geert Uytterhoeven <geert@linux-m68k.org> | 2013-09-26 09:54:16 +0200 |
| commit | 77a42796786c2ea2d3a67262fb5f1f707c3e0594 (patch) | |
| tree | a93f7eac94f0d118ebda42509093b872f7b0efd0 /arch/m68k/include | |
| parent | m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned() (diff) | |
| download | linux-dev-77a42796786c2ea2d3a67262fb5f1f707c3e0594.tar.xz linux-dev-77a42796786c2ea2d3a67262fb5f1f707c3e0594.zip | |
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')
| -rw-r--r-- | arch/m68k/include/asm/floppy.h | 2 | ||||
| -rw-r--r-- | arch/m68k/include/asm/sun3xflop.h | 2 |
2 files changed, 2 insertions, 2 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; 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; } |