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

• Lines: 36
• Date: Fri Mar 1 07:50:42 1996
• Orig file: v1.3.69/linux/drivers/net/3c507.c
• Orig date: Thu Nov 9 11:23:49 1995

diff -u --recursive --new-file v1.3.69/linux/drivers/net/3c507.c linux/drivers/net/3c507.c
@@ -280,7 +280,7 @@
 static int	el16_probe1(struct device *dev, int ioaddr);
 static int	el16_open(struct device *dev);
 static int	el16_send_packet(struct sk_buff *skb, struct device *dev);
-static void	el16_interrupt(int irq, struct pt_regs *regs);
+static void	el16_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static void el16_rx(struct device *dev);
 static int	el16_close(struct device *dev);
 static struct enet_statistics *el16_get_stats(struct device *dev);
@@ -361,7 +361,7 @@
 
 	irq = inb(ioaddr + IRQ_CONFIG) & 0x0f;
 
-	irqval = request_irq(irq, &el16_interrupt, 0, "3c507");
+	irqval = request_irq(irq, &el16_interrupt, 0, "3c507", NULL);
 	if (irqval) {
 		printk ("unable to get IRQ %d (irqval=%d).\n", irq, irqval);
 		return EAGAIN;
@@ -513,7 +513,7 @@
 /*	The typical workload of the driver:
 	Handle the network interface interrupts. */
 static void
-el16_interrupt(int irq, struct pt_regs *regs)
+el16_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	struct device *dev = (struct device *)(irq2dev_map[irq]);
 	struct net_local *lp;
@@ -907,7 +907,7 @@
 	dev_3c507.priv = NULL;
 
 	/* If we don't do this, we can't re-insmod it later. */
-	free_irq(dev_3c507.irq);
+	free_irq(dev_3c507.irq, NULL);
 	release_region(dev_3c507.base_addr, EL16_IO_EXTENT);
 }
 #endif /* MODULE */