diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /drivers/char/amikeyb.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'drivers/char/amikeyb.c')
| -rw-r--r-- | drivers/char/amikeyb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/amikeyb.c b/drivers/char/amikeyb.c index 42e1ea7c8..41bb7ac15 100644 --- a/drivers/char/amikeyb.c +++ b/drivers/char/amikeyb.c @@ -17,13 +17,14 @@ #include <linux/interrupt.h> #include <linux/errno.h> #include <linux/keyboard.h> +#include <linux/kd.h> +#include <linux/kbd_ll.h> #include <linux/delay.h> #include <linux/timer.h> -#include <linux/kd.h> #include <linux/random.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/kbd_ll.h> +#include <linux/kbd_kern.h> #include <asm/amigaints.h> #include <asm/amigahw.h> @@ -230,7 +231,7 @@ static void keyboard_interrupt(int irq, void *dummy, struct pt_regs *fp) /* switch CIA serial port to input mode */ ciaa.cra &= ~0x40; - mark_bh(KEYBOARD_BH); + tasklet_schedule(&keyboard_tasklet); /* rotate scan code to get up/down bit in proper position */ scancode = ((scancode >> 1) & 0x7f) | ((scancode << 7) & 0x80); |