diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
| commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
| tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /include/asm-sh/keyboard.h | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'include/asm-sh/keyboard.h')
| -rw-r--r-- | include/asm-sh/keyboard.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/asm-sh/keyboard.h b/include/asm-sh/keyboard.h index 9a64c5113..f1b8eb142 100644 --- a/include/asm-sh/keyboard.h +++ b/include/asm-sh/keyboard.h @@ -3,7 +3,8 @@ /* * $Id: keyboard.h,v 1.1 2000/06/10 21:45:48 yaegashi Exp $ */ -#include <linux/config.h> + +#include <asm/machvec.h> static __inline__ int kbd_setkeycode(unsigned int scancode, unsigned int keycode) @@ -32,13 +33,13 @@ static __inline__ void kbd_leds(unsigned char leds) { } -#ifdef CONFIG_SH_HP600 -void __init hp600_kbd_init_hw(void); -#define kbd_init_hw hp600_kbd_init_hw -#else +extern void hp600_kbd_init_hw(void); + static __inline__ void kbd_init_hw(void) { + if (MACH_HP600) { + hp600_kbd_init_hw(); + } } -#endif #endif |