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

Next file: linux/drivers/char/busmouse.c
Previous file: linux/drivers/cdrom/sonycd535.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.69/linux/drivers/char/atixlmouse.c linux/drivers/char/atixlmouse.c
@@ -69,7 +69,7 @@
 	struct fasync_struct *fasync;
 } mouse;
 
-void mouse_interrupt(int irq, struct pt_regs * regs)
+void mouse_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
 	char dx, dy, buttons;
 
@@ -110,7 +110,7 @@
 		return;
 	ATIXL_MSE_INT_OFF(); /* Interrupts are really shut down here */
 	mouse.ready = 0;
-	free_irq(ATIXL_MOUSE_IRQ);
+	free_irq(ATIXL_MOUSE_IRQ, NULL);
 	MOD_DEC_USE_COUNT;
 }
 
@@ -120,7 +120,7 @@
 		return -EINVAL;
 	if (mouse.active++)
 		return 0;
-	if (request_irq(ATIXL_MOUSE_IRQ, mouse_interrupt, 0, "ATIXL mouse")) {
+	if (request_irq(ATIXL_MOUSE_IRQ, mouse_interrupt, 0, "ATIXL mouse", 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