patch-1.3.81 linux/drivers/char/busmouse.c

Next file: linux/drivers/char/keyboard.c
Previous file: linux/drivers/char/atixlmouse.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.80/linux/drivers/char/busmouse.c linux/drivers/char/busmouse.c
@@ -41,7 +41,7 @@
 #include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
-#include <linux/mouse.h>
+#include <linux/miscdevice.h>
 #include <linux/random.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
@@ -240,7 +240,7 @@
 	fasync_mouse,
 };
 
-static struct mouse bus_mouse = {
+static struct miscdevice bus_mouse = {
 	LOGITECH_BUSMOUSE, "busmouse", &bus_mouse_fops
 };
 
@@ -272,7 +272,7 @@
 	mouse.wait = NULL;
 	printk("Logitech bus mouse detected, using IRQ %d.\n",
 	       mouse_irq);
-	mouse_register(&bus_mouse);
+	misc_register(&bus_mouse);
 	return 0;
 }
 
@@ -285,7 +285,7 @@
 
 void cleanup_module(void)
 {
-	mouse_deregister(&bus_mouse);
+	misc_deregister(&bus_mouse);
 	release_region(LOGIBM_BASE, LOGIBM_EXTENT);
 }
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this