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

Next file: linux/drivers/char/console.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.69/linux/drivers/char/busmouse.c linux/drivers/char/busmouse.c
@@ -60,7 +60,7 @@
 		mouse_irq=ints[1];
 }
 
-static void mouse_interrupt(int irq, struct pt_regs *regs)
+static void mouse_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	char dx, dy;
 	unsigned char buttons;
@@ -124,7 +124,7 @@
 	if (--mouse.active)
 		return;
 	MSE_INT_OFF();
-	free_irq(mouse_irq);
+	free_irq(mouse_irq, NULL);
 	MOD_DEC_USE_COUNT;
 }
 
@@ -138,7 +138,7 @@
 		return -EINVAL;
 	if (mouse.active++)
 		return 0;
-	if (request_irq(mouse_irq, mouse_interrupt, 0, "busmouse")) {
+	if (request_irq(mouse_irq, mouse_interrupt, 0, "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