diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 19:29:29 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 13:58:49 -0700 |
| commit | b1e05aa2303e48b16e850c4be2513e60a3495238 (patch) | |
| tree | 2086620ade94db7d712ee9df2a87049e20c9ceba /include/asm-x86_64/floppy.h | |
| parent | [PATCH] irq-flags: V850: Use the new IRQF_ constants (diff) | |
| download | linux-dev-b1e05aa2303e48b16e850c4be2513e60a3495238.tar.xz linux-dev-b1e05aa2303e48b16e850c4be2513e60a3495238.zip | |
[PATCH] irq-flags: x86_64: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64/floppy.h')
| -rw-r--r-- | include/asm-x86_64/floppy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86_64/floppy.h b/include/asm-x86_64/floppy.h index 006291e89b4a..32ff5d132714 100644 --- a/include/asm-x86_64/floppy.h +++ b/include/asm-x86_64/floppy.h @@ -144,11 +144,11 @@ static int vdma_get_dma_residue(unsigned int dummy) static int fd_request_irq(void) { if(can_use_virtual_dma) - return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, - "floppy", NULL); + return request_irq(FLOPPY_IRQ, floppy_hardint, + IRQF_DISABLED, "floppy", NULL); else - return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, - "floppy", NULL); + return request_irq(FLOPPY_IRQ, floppy_interrupt, + IRQF_DISABLED, "floppy", NULL); } static unsigned long dma_mem_alloc(unsigned long size) |