projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[linux-2.6-block.git]
/
drivers
/
char
/
qtronix.c
diff --git
a/drivers/char/qtronix.c
b/drivers/char/qtronix.c
index 1087530e58549ba6d3b60c0b636875d21332218e..9d134e98d2a0daa347ca72259579ddb7333b2083 100644
(file)
--- a/
drivers/char/qtronix.c
+++ b/
drivers/char/qtronix.c
@@
-144,7
+144,7
@@
void __init init_qtronix_990P_kbd(void)
cir_port_init(cir);
retval = request_irq(IT8172_CIR0_IRQ, kbd_int_handler,
- (unsigned long )(
SA_INTERRUPT|SA_SHIRQ),
+ (unsigned long )(
IRQF_DISABLED|IRQF_SHARED),
(const char *)"Qtronix IR Keyboard", (void *)cir);
if (retval) {