diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 13:17:07 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 13:17:07 +0400 |
| commit | 0a759b2466d19c619257fec36f988f93424cf3ae (patch) | |
| tree | 910e531540bda17c484b53b89fb2f1d6dd41a454 /arch/m68k/include/asm/floppy.h | |
| parent | 78d4a42069b4815040a857a4e9bb0e4fb0aa1dc8 (diff) | |
| parent | 77a42796786c2ea2d3a67262fb5f1f707c3e0594 (diff) | |
| download | linux-0a759b2466d19c619257fec36f988f93424cf3ae.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"Summary:
- __put_user_unaligned may/will be used by btrfs
- m68k part of a global cleanup"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Remove deprecated IRQF_DISABLED
m68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned()
Diffstat (limited to 'arch/m68k/include/asm/floppy.h')
| -rw-r--r-- | arch/m68k/include/asm/floppy.h | 2 |
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; |