patch-2.3.23 linux/drivers/acorn/char/keyb_arc.c

Next file: linux/drivers/acorn/net/ether1.c
Previous file: linux/drivers/acorn/block/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.22/linux/drivers/acorn/char/keyb_arc.c linux/drivers/acorn/char/keyb_arc.c
@@ -31,7 +31,7 @@
 #include <asm/ioc.h>
 #include <asm/hardware.h>
 
-#include "../../char/mouse.h"
+#include "../../char/busmouse.h"
 
 extern void kbd_reset_kdown(void);
 
@@ -47,7 +47,7 @@
 static unsigned char kbd_txhead, kbd_txtail;
 #define KBD_INCTXPTR(ptr) ((ptr) = ((ptr) + 1) & 3)
 static int kbd_id = -1;
-static struct wait_queue *kbd_waitq;
+static DECLARE_WAIT_QUEUE_HEAD(kbd_waitq);
 #ifdef CONFIG_KBDMOUSE
 static int mousedev;
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)