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

Next file: linux/drivers/net/depca.c
Previous file: linux/drivers/net/de600.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.69/linux/drivers/net/de620.c linux/drivers/net/de620.c
@@ -210,7 +210,7 @@
 static int	de620_start_xmit(struct sk_buff *, struct device *);
 
 /* Dispatch from interrupts. */
-static void	de620_interrupt(int, struct pt_regs *);
+static void	de620_interrupt(int, void *, struct pt_regs *);
 static int	de620_rx_intr(struct device *);
 
 /* Initialization */
@@ -432,7 +432,7 @@
 static int
 de620_open(struct device *dev)
 {
-	if (request_irq(dev->irq, de620_interrupt, 0, "de620")) {
+	if (request_irq(dev->irq, de620_interrupt, 0, "de620", NULL)) {
 		printk ("%s: unable to get IRQ %d\n", dev->name, dev->irq);
 		return 1;
 	}
@@ -457,7 +457,7 @@
 	/* disable recv */
 	de620_set_register(dev, W_TCR, RXOFF);
 
-	free_irq(dev->irq);
+	free_irq(dev->irq, NULL);
 	irq2dev_map[dev->irq] = NULL;
 
 	dev->start = 0;
@@ -598,7 +598,7 @@
  *
  */
 static void
-de620_interrupt(int irq_in, struct pt_regs *regs)
+de620_interrupt(int irq_in, void *dev_id, struct pt_regs *regs)
 {
 	struct device *dev = irq2dev_map[irq_in];
 	byte irq_status;

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