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

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

diff -u --recursive --new-file v1.3.69/linux/drivers/net/pt.c linux/drivers/net/pt.c
@@ -120,7 +120,7 @@
 static int pt_probe(struct device *dev);
 static int pt_open(struct device *dev);
 static int pt_send_packet(struct sk_buff *skb, struct device *dev);
-static void pt_interrupt(int irq, struct pt_regs *regs);
+static void pt_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static int pt_close(struct device *dev);
 static int pt_ioctl(struct device *dev, struct ifreq *ifr, int cmd);
 static struct enet_statistics *pt_get_stats(struct device *dev);
@@ -868,7 +868,7 @@
          * the interrupt, and this marks the 'irqaction' as busy.
          */
         {
-            int irqval = request_irq(dev->irq, &pt_interrupt,0, "pt");
+            int irqval = request_irq(dev->irq, &pt_interrupt,0, "pt", NULL);
             if (irqval) {
                 printk("PT: ERROR: Unable to get IRQ %d (irqval = %d).\n",
                     dev->irq, irqval);
@@ -932,7 +932,7 @@
         {
             if (request_dma(dev->dma, "pt"))
             {
-                free_irq(dev->irq);
+                free_irq(dev->irq, NULL);
                 return -EAGAIN;
             }
         }
@@ -1480,7 +1480,7 @@
  * This routine is called by the kernel when there is an interrupt for the
  * PT.
  */
-static void pt_interrupt(int irq, struct pt_regs *regs)
+static void pt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
     /* It's a tad dodgy here, but we assume pt0a until proven otherwise */
     struct device *dev = &pt0a;

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