diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-03 02:20:05 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 17:29:22 -0700 |
| commit | 52e405eaa9806968e88b35d65e57acad954a5ab5 (patch) | |
| tree | b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /include/asm-arm/floppy.h | |
| parent | d061daa0e3abdddc28e21a37c8ac4536dedbf239 (diff) | |
| download | op-kernel-dev-52e405eaa9806968e88b35d65e57acad954a5ab5.zip op-kernel-dev-52e405eaa9806968e88b35d65e57acad954a5ab5.tar.gz | |
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
The irgflags consolidation did conflict with the ARM to generic IRQ
conversion and was not applied for ARM. Fix it up.
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-arm/floppy.h')
| -rw-r--r-- | include/asm-arm/floppy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/floppy.h b/include/asm-arm/floppy.h index aa0c8d2..54b5ae4 100644 --- a/include/asm-arm/floppy.h +++ b/include/asm-arm/floppy.h @@ -25,7 +25,7 @@ #define fd_inb(port) inb((port)) #define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\ - SA_INTERRUPT,"floppy",NULL) + IRQF_DISABLED,"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) |
