patch-1.3.70 linux/drivers/char/scc.c

• Lines: 36
• Date: Fri Mar 1 07:50:41 1996
• Orig file: v1.3.69/linux/drivers/char/scc.c
• Orig date: Sat Feb 17 16:02:48 1996

diff -u --recursive --new-file v1.3.69/linux/drivers/char/scc.c linux/drivers/char/scc.c
@@ -238,7 +238,7 @@
 static void scc_exint(register struct scc_channel *scc);
 static void scc_rxint(register struct scc_channel *scc);
 static void scc_spint(register struct scc_channel *scc);
-static void scc_isr(int irq, struct pt_regs *regs);
+static void scc_isr(int irq, void *dev_id, struct pt_regs *regs);
 static void scc_tx_timer(unsigned long);
 static void scc_rx_timer(unsigned long);
 static void scc_init_timer(struct scc_channel *scc);
@@ -732,7 +732,7 @@
  */
 
 static void
-scc_isr(int irq, struct pt_regs *regs)
+scc_isr(int irq, void *dev_id, struct pt_regs *regs)
 {
 	register unsigned char vector;	
 	register struct scc_channel *scc;
@@ -2128,7 +2128,7 @@
 			
 			if (!Ivec[hwcfg.irq].used && hwcfg.irq)
 			{
-				if (request_irq(hwcfg.irq, scc_isr, SA_INTERRUPT, "AX.25 SCC"))
+				if (request_irq(hwcfg.irq, scc_isr, SA_INTERRUPT, "AX.25 SCC", NULL))
 					printk("z8530drv: Warning --- could not get IRQ %d\n", hwcfg.irq);
 				else
 					Ivec[hwcfg.irq].used = 1;
@@ -2784,7 +2784,7 @@
 	}
 	
 	for (k=0; k < 16 ; k++)
-		if (Ivec[k].used) free_irq(k);
+		if (Ivec[k].used) free_irq(k, NULL);
 		
 	restore_flags(flags);
 }