diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /include/asm-m68k/keyboard.h | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'include/asm-m68k/keyboard.h')
| -rw-r--r-- | include/asm-m68k/keyboard.h | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/include/asm-m68k/keyboard.h b/include/asm-m68k/keyboard.h index 555ef68ec..4129be701 100644 --- a/include/asm-m68k/keyboard.h +++ b/include/asm-m68k/keyboard.h @@ -8,12 +8,12 @@ * This file contains the m68k architecture specific keyboard definitions */ -#include <linux/config.h> /* CONFIG_MAGIC_SYSRQ */ #ifndef __M68K_KEYBOARD_H #define __M68K_KEYBOARD_H #ifdef __KERNEL__ +#include <linux/config.h> #include <asm/machdep.h> #ifdef CONFIG_Q40 @@ -39,17 +39,6 @@ static __inline__ int kbd_getkeycode(unsigned int scancode) return scancode > 127 ? -EINVAL : scancode; } -static __inline__ int kbd_translate(unsigned char scancode, - unsigned char *keycode, char raw_mode) -{ -#ifdef CONFIG_Q40 - if (MACH_IS_Q40) - return q40kbd_translate(scancode,keycode,raw_mode); -#endif - *keycode = scancode; - return 1; -} - static __inline__ char kbd_unexpected_up(unsigned char keycode) { #ifdef CONFIG_Q40 @@ -65,15 +54,16 @@ static __inline__ void kbd_leds(unsigned char leds) mach_kbd_leds(leds); } -#ifdef CONFIG_MAGIC_SYSRQ -#define kbd_is_sysrq(keycode) ((keycode) == mach_sysrq_key && \ - (up_flag || \ - (shift_state & mach_sysrq_shift_mask) == \ - mach_sysrq_shift_state)) -#define kbd_sysrq_xlate mach_sysrq_xlate -#endif +#define kbd_init_hw mach_keyb_init +#define kbd_translate mach_kbd_translate + +#define kbd_sysrq_xlate mach_sysrq_xlate + +/* resource allocation */ +#define kbd_request_region() +#define kbd_request_irq(handler) -#define kbd_init_hw mach_keyb_init +extern unsigned int SYSRQ_KEY; #endif /* __KERNEL__ */ |