On Mon, 11 Dec 2006, Michael Schmitz wrote:
Second part: Atari keyboard and mouse support.
Signed-Off-By: <schmitz@xxxxxxxxxx>
Atari keyboard and mouse fixes:
- Kill unused variables
- Add missing declaration of atari_keyb_init()
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
--- linux-m68k-2.6.19.orig/arch/m68k/atari/atakeyb.c 2006-12-12 21:52:31.000000000 +0100
+++ linux-m68k-2.6.19/arch/m68k/atari/atakeyb.c 2006-12-12 21:52:38.000000000 +0100
@@ -145,13 +145,9 @@ static unsigned int key_repeat_rate = D
static unsigned char rep_scancode;
static struct timer_list atakeyb_rep_timer = { function: atakeyb_rep };
-struct pt_regs *atakbd_pt_regs;
-
static void atakeyb_rep( unsigned long ignore )
{
- atakbd_pt_regs = NULL;
-
/* Disable keyboard for the time we call handle_scancode(), else a race
* in the keyboard tty queue may happen */
atari_disable_irq( IRQ_MFP_ACIA );
--- linux-m68k-2.6.19.orig/drivers/input/mouse/atarimouse.c 2006-12-12 21:52:31.000000000 +0100
+++ linux-m68k-2.6.19/drivers/input/mouse/atarimouse.c 2006-12-12 21:52:38.000000000 +0100
@@ -65,14 +65,12 @@ MODULE_PARM(mouse_threshold, "2i");
extern int atari_mouse_buttons;
#endif
static int atamouse_used = 0;
-static int atamouse_lastx, atamouse_lasty;
static struct input_dev *atamouse_dev;
static void atamouse_interrupt(char *buf)
{
- int buttons;
- int nx, ny, dx, dy;
+ int buttons, dx, dy;
/* ikbd_mouse_disable(); */
--- linux-m68k-2.6.19.orig/include/asm-m68k/atarikb.h 2006-12-12 21:52:31.000000000 +0100
+++ linux-m68k-2.6.19/include/asm-m68k/atarikb.h 2006-12-12 21:52:38.000000000 +0100
@@ -41,6 +41,6 @@ extern void (*atari_input_keyboard_inter
/* Hook for mouse inputdev driver */
extern void (*atari_input_mouse_interrupt_hook) (char *);
-extern struct pt_regs *atakbd_pt_regs;
+extern int __init atari_keyb_init(void);
#endif /* _LINUX_ATARIKB_H */
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
