patch-1.3.70 linux/drivers/net/plip.c

• Lines: 36
• Date: Fri Mar 1 07:50:45 1996
• Orig file: v1.3.69/linux/drivers/net/plip.c
• Orig date: Sat Nov 11 17:41:33 1995

diff -u --recursive --new-file v1.3.69/linux/drivers/net/plip.c linux/drivers/net/plip.c
@@ -139,7 +139,7 @@
 static void plip_bh(struct device *dev);
 
 /* Interrupt handler */
-static void plip_interrupt(int irq, struct pt_regs *regs);
+static void plip_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 
 /* Functions for DEV methods */
 static int plip_rebuild_header(void *buff, struct device *dev,
@@ -800,7 +800,7 @@
 
 /* Handle the parallel port interrupts. */
 static void
-plip_interrupt(int irq, struct pt_regs * regs)
+plip_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
 	struct device *dev = (struct device *) irq2dev_map[irq];
 	struct net_local *nl = (struct net_local *)dev->priv;
@@ -940,7 +940,7 @@
 		return -EAGAIN;
 	}
 	cli();
-	if (request_irq(dev->irq , plip_interrupt, 0, dev->name) != 0) {
+	if (request_irq(dev->irq , plip_interrupt, 0, dev->name, NULL) != 0) {
 		sti();
 		printk("%s: couldn't get IRQ %d.\n", dev->name, dev->irq);
 		return -EAGAIN;
@@ -983,7 +983,7 @@
 	dev->tbusy = 1;
 	dev->start = 0;
 	cli();
-	free_irq(dev->irq);
+	free_irq(dev->irq, NULL);
 	irq2dev_map[dev->irq] = NULL;
 	nl->is_deferred = 0;
 	nl->connection = PLIP_CN_NONE;