git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-sh
/
mpc1211
/
keyboard.h
diff --git
a/include/asm-sh/mpc1211/keyboard.h
b/include/asm-sh/mpc1211/keyboard.h
index
5f0b908
..
71ef4cf
100644
(file)
--- a/
include/asm-sh/mpc1211/keyboard.h
+++ b/
include/asm-sh/mpc1211/keyboard.h
@@
-57,7
+57,7
@@
extern unsigned char pckbd_sysrq_xlate[128];
#define AUX_IRQ 12
#define aux_request_irq(hand, dev_id) \
#define AUX_IRQ 12
#define aux_request_irq(hand, dev_id) \
- request_irq(AUX_IRQ, hand,
SA_SHIRQ
, "PS2 Mouse", dev_id)
+ request_irq(AUX_IRQ, hand,
IRQF_SHARED
, "PS2 Mouse", dev_id)
#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
#define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)