summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k/sun3xflop.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-02 04:29:19 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 22:58:47 +0200
commitb0b9fdc123cf0f1b671ac3f593d77af325ad4cf3 (patch)
treee4884524c5c85bbc2de481d4efecf3ca4b8bc349 /include/asm-m68k/sun3xflop.h
parent[PATCH] irq-flags: M68KNOMMU: Use the new IRQF_ constants (diff)
downloadlinux-b0b9fdc123cf0f1b671ac3f593d77af325ad4cf3.tar.xz
linux-b0b9fdc123cf0f1b671ac3f593d77af325ad4cf3.zip
[PATCH] irq-flags: M68K: 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: Roman Zippel <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
-rw-r--r--include/asm-m68k/sun3xflop.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-m68k/sun3xflop.h b/include/asm-m68k/sun3xflop.h
index 98a9f79dab29..ca8cc4113843 100644
--- a/include/asm-m68k/sun3xflop.h
+++ b/include/asm-m68k/sun3xflop.h
@@ -208,7 +208,8 @@ static int sun3xflop_request_irq(void)
if(!once) {
once = 1;
- error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, SA_INTERRUPT, "floppy", NULL);
+ error = request_irq(FLOPPY_IRQ, sun3xflop_hardint,
+ IRQF_DISABLED, "floppy", NULL);
return ((error == 0) ? 0 : -1);
} else return 0;
}