diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-23 23:05:26 -0400 |
| commit | 8b1aaeaf54f1bcaa0bbec6bb170db367c998d27c (patch) | |
| tree | 2478e1708f5a3da261597f4aa1011d4d41c2cc84 /arch/m68k/include/asm/atarikb.h | |
| parent | bca606a646a2b1f4fa1ae2b22a0ac707505d7297 (diff) | |
| parent | 5e152b4c9e0fce6149c74406346a7ae7e7a17727 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Diffstat (limited to 'arch/m68k/include/asm/atarikb.h')
| -rw-r--r-- | arch/m68k/include/asm/atarikb.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/atarikb.h b/arch/m68k/include/asm/atarikb.h index 546e7da5804f..68f3622bf591 100644 --- a/arch/m68k/include/asm/atarikb.h +++ b/arch/m68k/include/asm/atarikb.h | |||
| @@ -34,8 +34,6 @@ void ikbd_joystick_disable(void); | |||
| 34 | 34 | ||
| 35 | /* Hook for MIDI serial driver */ | 35 | /* Hook for MIDI serial driver */ |
| 36 | extern void (*atari_MIDI_interrupt_hook) (void); | 36 | extern void (*atari_MIDI_interrupt_hook) (void); |
| 37 | /* Hook for mouse driver */ | ||
| 38 | extern void (*atari_mouse_interrupt_hook) (char *); | ||
| 39 | /* Hook for keyboard inputdev driver */ | 37 | /* Hook for keyboard inputdev driver */ |
| 40 | extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); | 38 | extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char); |
| 41 | /* Hook for mouse inputdev driver */ | 39 | /* Hook for mouse inputdev driver */ |