diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 19:49:45 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 19:49:45 +0200 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /include/asm-sh/mpc1211/keyboard.h | |
| parent | Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff) | |
| parent | [PATCH] genirq: Fixup ARM devel merge (diff) | |
| download | linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.tar.xz linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.zip | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'include/asm-sh/mpc1211/keyboard.h')
| -rw-r--r-- | include/asm-sh/mpc1211/keyboard.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/mpc1211/keyboard.h b/include/asm-sh/mpc1211/keyboard.h index 5f0b9088c796..71ef4cf4242d 100644 --- 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) \ - 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) |