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

• Lines: 36
• Date: Fri Mar 1 07:50:44 1996
• Orig file: v1.3.69/linux/drivers/net/ibmtr.c
• Orig date: Sun Feb 11 15:32:45 1996

diff -u --recursive --new-file v1.3.69/linux/drivers/net/ibmtr.c linux/drivers/net/ibmtr.c
@@ -134,7 +134,7 @@
 unsigned char get_sram_size(struct tok_info *adapt_info);
 
 static void tok_init_card(unsigned long dev_addr);
-static void tok_interrupt(int irq, struct pt_regs *regs);
+static void tok_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 
 static void initial_tok_int(struct device *dev);
 
@@ -481,7 +481,7 @@
   DPRINTK("Using %dK shared RAM\n",ti->mapped_ram_size/2);
 #endif
 
-  if (request_irq (dev->irq = irq, &tok_interrupt,0,"IBM TR") != 0) {
+  if (request_irq (dev->irq = irq, &tok_interrupt,0,"IBM TR", NULL) != 0) {
     DPRINTK("Could not grab irq %d.  Halting Token Ring driver.\n",irq);
     badti = ti;    /*  keep track of unused tok_info */
     return ENODEV;
@@ -590,7 +590,7 @@
 	return 0;
 }
 
-static void tok_interrupt (int irq, struct pt_regs *regs)
+static void tok_interrupt (int irq, void *dev_id, struct pt_regs *regs)
 {
 
 	unsigned char status;
@@ -1315,7 +1315,7 @@
 	unregister_netdev(&dev_ibmtr);
 
 	/* If we don't do this, we can't re-insmod it later. */
-	free_irq(dev_ibmtr.irq);
+	free_irq(dev_ibmtr.irq, NULL);
 	irq2dev_map[dev_ibmtr.irq] = NULL;
 	release_region(dev_ibmtr.base_addr, TR_IO_EXTENT);
 }