patch-1.3.70 linux/drivers/cdrom/sonycd535.c

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

diff -u --recursive --new-file v1.3.69/linux/drivers/cdrom/sonycd535.c linux/drivers/cdrom/sonycd535.c
@@ -313,7 +313,7 @@
 }
 
 static void
-cdu535_interrupt(int irq, struct pt_regs *regs)
+cdu535_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	disable_interrupts();
 	if (cdu535_irq_wait != NULL)
@@ -1566,7 +1566,7 @@
 #endif
 			if (sony535_irq_used > 0) {
 			    if (request_irq(sony535_irq_used, cdu535_interrupt,
-								SA_INTERRUPT, CDU535_HANDLE)) {
+								SA_INTERRUPT, CDU535_HANDLE, NULL)) {
 					printk("Unable to grab IRQ%d for the " CDU535_MESSAGE_NAME
 							" driver; polling instead.\n", sony535_irq_used);
 					sony535_irq_used = 0;

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