diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 19:29:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 13:58:48 -0700 |
| commit | bc59d2800d535ff36dc9e6c5328b4a075076bbaa (patch) | |
| tree | fc2c82e64004a769226b9de38184212bd2e351d9 /include/asm-ppc | |
| parent | 6714465e83e784d65d0f4dbab7f2238574febfce (diff) | |
| download | op-kernel-dev-bc59d2800d535ff36dc9e6c5328b4a075076bbaa.zip op-kernel-dev-bc59d2800d535ff36dc9e6c5328b4a075076bbaa.tar.gz | |
[PATCH] irq-flags: PPC: 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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/floppy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h index 2ba191e..d3963ca 100644 --- a/include/asm-ppc/floppy.h +++ b/include/asm-ppc/floppy.h @@ -96,11 +96,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 int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) |
