aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/asm-parisc/floppy.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 19:29:21 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 13:58:47 -0700
commit733ea869e5756e0fd0333728cc1ed7c42e6ddfc0 (patch)
tree91fa076106e45ad7fb0c6b1492eee6b060fa4e43 /include/asm-parisc/floppy.h
parent[PATCH] irq-flags: MIPS: Use the new IRQF_ constants (diff)
downloadwireguard-linux-733ea869e5756e0fd0333728cc1ed7c42e6ddfc0.tar.xz
wireguard-linux-733ea869e5756e0fd0333728cc1ed7c42e6ddfc0.zip
[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.h8
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)
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)