summaryrefslogtreecommitdiff
path: root/arch/um/drivers/xterm_kern.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-02 06:29:27 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-03 00:58:48 +0400
commitbd6aa6502e7f82c39090aea29e4b644c29e720bd (patch)
tree170b011fec12097098f6e39f9c8a716578625fbc /arch/um/drivers/xterm_kern.c
parent6741320247fbf147ab8aa41b2a7201425ac1e1df (diff)
downloadlinux-bd6aa6502e7f82c39090aea29e4b644c29e720bd.tar.xz
[PATCH] irq-flags: UM: 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: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/drivers/xterm_kern.c')
-rw-r--r--arch/um/drivers/xterm_kern.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
index d269a80f4b0c..6036ec85895a 100644
--- a/arch/um/drivers/xterm_kern.c
+++ b/arch/um/drivers/xterm_kern.c
@@ -54,7 +54,7 @@ int xterm_fd(int socket, int *pid_out)
init_completion(&data->ready);
err = um_request_irq(XTERM_IRQ, socket, IRQ_READ, xterm_interrupt,
- SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
+ IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
"xterm", data);
if (err){
printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "