patch-1.3.70 linux/drivers/char/msbusmouse.c

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

diff -u --recursive --new-file v1.3.69/linux/drivers/char/msbusmouse.c linux/drivers/char/msbusmouse.c
@@ -48,7 +48,7 @@
 
 static struct mouse_status mouse;
 
-static void ms_mouse_interrupt(int irq, struct pt_regs * regs)
+static void ms_mouse_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
         char dx, dy;
 	unsigned char buttons;
@@ -97,7 +97,7 @@
 		return;
 	MS_MSE_INT_OFF();
 	mouse.ready = 0; 
-	free_irq(MOUSE_IRQ);
+	free_irq(MOUSE_IRQ, NULL);
 	MOD_DEC_USE_COUNT;
 }
 
@@ -107,7 +107,7 @@
 		return -EINVAL;
 	if (mouse.active++)
 		return 0;
-	if (request_irq(MOUSE_IRQ, ms_mouse_interrupt, 0, "MS Busmouse")) {
+	if (request_irq(MOUSE_IRQ, ms_mouse_interrupt, 0, "MS Busmouse", NULL)) {
 		mouse.active--;
 		return -EBUSY;
 	}

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