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

Next file: linux/drivers/isdn/teles/card.c
Previous file: linux/drivers/char/tpqic02.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.69/linux/drivers/char/wdt.c linux/drivers/char/wdt.c
@@ -69,7 +69,7 @@
  *	Kernel methods.
  */
  
-static void wdt_interrupt(int irq, struct pt_regs *regs)
+static void wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	/*
 	 *	Read the status register see what is up and
@@ -234,7 +234,7 @@
 int init_module(void)
 {
 	printk("WDT501-P module at %X(Interrupt %d)\n", io,irq);
-	if(request_irq(irq, wdt_interrupt, SA_INTERRUPT, "wdt501p"))
+	if(request_irq(irq, wdt_interrupt, SA_INTERRUPT, "wdt501p", NULL))
 	{
 		printk("IRQ %d is not free.\n", irq);
 		return -EIO;
@@ -254,7 +254,7 @@
 	mouse_deregister(&temp_mouse);
 #endif	
 	release_region(io,8);
-	free_irq(irq);
+	free_irq(irq, NULL);
 }
 
 #else
@@ -262,7 +262,7 @@
 int wdt_init(void)
 {
 	printk("WDT500/501-P driver at %X(Interrupt %d)\n", io,irq);
-	if(request_irq(irq, wdt_interrupt, SA_INTERRUPT, "wdt501p"))
+	if(request_irq(irq, wdt_interrupt, SA_INTERRUPT, "wdt501p", NULL))
 	{
 		printk("IRQ %d is not free.\n", irq);
 		return -EIO;

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