summaryrefslogtreecommitdiffstats
path: root/include/linux/keyboard.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
commit59223edaa18759982db0a8aced0e77457d10c68e (patch)
tree89354903b01fa0a447bffeefe00df3044495db2e /include/linux/keyboard.h
parentdb7d4daea91e105e3859cf461d7e53b9b77454b2 (diff)
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'include/linux/keyboard.h')
-rw-r--r--include/linux/keyboard.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/keyboard.h b/include/linux/keyboard.h
index 6829c6536..37cf120ae 100644
--- a/include/linux/keyboard.h
+++ b/include/linux/keyboard.h
@@ -1,6 +1,8 @@
#ifndef __LINUX_KEYBOARD_H
#define __LINUX_KEYBOARD_H
+#include <linux/wait.h>
+
#define KG_SHIFT 0
#define KG_CTRL 2
#define KG_ALT 3
@@ -24,7 +26,7 @@ extern const int NR_TYPES;
extern const int max_vals[];
extern unsigned short *key_maps[MAX_NR_KEYMAPS];
extern unsigned short plain_map[NR_KEYS];
-extern struct wait_queue * keypress_wait;
+extern wait_queue_head_t keypress_wait;
extern unsigned char keyboard_type;
#endif