Update of /cvsroot/linux-vax/kernel-2.5/include/asm-parisc
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/include/asm-parisc
Modified Files:
keyboard.h
Log Message:
Merge with 2.5.58
Index: keyboard.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/asm-parisc/keyboard.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keyboard.h 21 Apr 2003 22:50:04 -0000 1.3
+++ keyboard.h 3 Aug 2003 12:40:18 -0000 1.4
@@ -28,7 +28,6 @@
#include <linux/config.h>
#ifdef __KERNEL__
-#ifdef CONFIG_VT
#include <linux/kernel.h>
#include <linux/kd.h>
@@ -56,18 +55,11 @@
void (*init_hw)(void);
/* Keyboard driver resource allocation */
- void (*kbd_request_region)(void);
int (*kbd_request_irq)(void (*handler)(int, void *, struct pt_regs *));
- /* Methods to access the keyboard processor's I/O registers */
- unsigned char (*kbd_read_input)(void);
- void (*kbd_write_output)(unsigned char val);
- void (*kbd_write_command)(unsigned char val);
- unsigned char (*kbd_read_status)(void);
-
unsigned char sysrq_key;
unsigned char *sysrq_xlate;
-} *kbd_ops;
+} kbd_ops;
#define kbd_setkeycode (*kbd_ops->setkeycode)
#define kbd_getkeycode (*kbd_ops->getkeycode)
@@ -80,19 +72,12 @@
#define kbd_sysrq_xlate (kbd_ops->sysrq_xlate)
/* Do the actual calls via kbd_ops vector */
-#define kbd_request_region() kbd_ops->kbd_request_region()
#define kbd_request_irq(handler) kbd_ops->kbd_request_irq(handler)
-#define kbd_read_input() kbd_ops->kbd_read_input()
-#define kbd_write_output(val) kbd_ops->kbd_write_output(val)
-#define kbd_write_command(val) kbd_ops->kbd_write_command(val)
-#define kbd_read_status() kbd_ops->kbd_read_status()
extern unsigned char hp_ps2kbd_sysrq_xlate[128]; /* from drivers/char/hp_keyb.c */
extern void unregister_kbd_ops(void);
extern void register_kbd_ops(struct kbd_ops *ops);
-
-#endif /* CONFIG_VT */
#endif /* __KERNEL__ */
|
