diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:47 -0400 |
commit | 733ea869e5756e0fd0333728cc1ed7c42e6ddfc0 (patch) | |
tree | 91fa076106e45ad7fb0c6b1492eee6b060fa4e43 /include/asm-parisc/floppy.h | |
parent | f40298fddcc3c8115c6135c9733f5a0de52dcea9 (diff) |
[PATCH] irq-flags: PARISC: 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: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-parisc/floppy.h')
-rw-r--r-- | include/asm-parisc/floppy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-parisc/floppy.h b/include/asm-parisc/floppy.h index 458cdb2a7530..da2f9c157143 100644 --- a/include/asm-parisc/floppy.h +++ b/include/asm-parisc/floppy.h | |||
@@ -156,11 +156,11 @@ static int vdma_get_dma_residue(unsigned int dummy) | |||
156 | static int fd_request_irq(void) | 156 | static int fd_request_irq(void) |
157 | { | 157 | { |
158 | if(can_use_virtual_dma) | 158 | if(can_use_virtual_dma) |
159 | return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, | 159 | return request_irq(FLOPPY_IRQ, floppy_hardint, |
160 | "floppy", NULL); | 160 | IRQF_DISABLED, "floppy", NULL); |
161 | else | 161 | else |
162 | return request_irq(FLOPPY_IRQ, floppy_interrupt, SA_INTERRUPT, | 162 | return request_irq(FLOPPY_IRQ, floppy_interrupt, |
163 | "floppy", NULL); | 163 | IRQF_DISABLED, "floppy", NULL); |
164 | } | 164 | } |
165 | 165 | ||
166 | static unsigned long dma_mem_alloc(unsigned long size) | 166 | static unsigned long dma_mem_alloc(unsigned long size) |