patch-1.3.70 linux/drivers/net/3c505.c

Next file: linux/drivers/net/3c507.c
Previous file: linux/drivers/net/3c503.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.69/linux/drivers/net/3c505.c linux/drivers/net/3c505.c
@@ -635,7 +635,7 @@
  ******************************************************/
 
 static void
-elp_interrupt (int irq, struct pt_regs *reg_ptr)
+elp_interrupt (int irq, void *dev_id, struct pt_regs *reg_ptr)
 {
 	int len;
 	int dlen;
@@ -859,7 +859,7 @@
 	/*
 	 * install our interrupt service routine
 	 */
-	if (request_irq(dev->irq, &elp_interrupt, 0, "3c505")) {
+	if (request_irq(dev->irq, &elp_interrupt, 0, "3c505", NULL)) {
 		irq2dev_map[dev->irq] = NULL;
 		return -EAGAIN;
 	}
@@ -1150,7 +1150,7 @@
 	/*
 	 * release the IRQ
 	 */
-	free_irq(dev->irq);
+	free_irq(dev->irq, NULL);
 
 	/*
 	 * and we no longer have to map irq to dev either

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