diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:49 -0400 |
commit | b1e05aa2303e48b16e850c4be2513e60a3495238 (patch) | |
tree | 2086620ade94db7d712ee9df2a87049e20c9ceba /include/asm-x86_64/floppy.h | |
parent | 8b91fbb8338bae702f5a6c984fb05f1a01f6590c (diff) |
[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) | |||
144 | static int fd_request_irq(void) | 144 | static int fd_request_irq(void) |
145 | { | 145 | { |
146 | if(can_use_virtual_dma) | 146 | if(can_use_virtual_dma) |
147 | return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, | 147 | return request_irq(FLOPPY_IRQ, floppy_hardint, |
148 | "floppy", NULL); | 148 | IRQF_DISABLED, "floppy", NULL); |
149 | else | 149 | else |
150 | return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, | 150 | return request_irq(FLOPPY_IRQ, floppy_interrupt, |
151 | "floppy", NULL); | 151 | IRQF_DISABLED, "floppy", NULL); |
152 | } | 152 | } |
153 | 153 | ||
154 | static unsigned long dma_mem_alloc(unsigned long size) | 154 | static unsigned long dma_mem_alloc(unsigned long size) |