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

Next file: linux/drivers/isdn/icn/icn.c
Previous file: linux/drivers/char/tga.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.86/linux/drivers/char/wdt.c linux/drivers/char/wdt.c
@@ -48,7 +48,7 @@
 #define WD_TIMO (100*60)		/* 1 minute */
 
 /*
- *	Programming suppoort
+ *	Programming support
  */
  
 static void wdt_ctr_mode(int ctr, int mode)
@@ -213,7 +213,7 @@
 	wdt_release
 };
 
-static struct miscdevice wdt_mouse=
+static struct miscdevice wdt_miscdev=
 {
 	WATCHDOG_MINOR,
 	"wdt",
@@ -221,7 +221,7 @@
 };
 
 #ifdef CONFIG_WDT_501
-static struct miscdevice temp_mouse=
+static struct miscdevice temp_miscdev=
 {
 	TEMP_MINOR,
 	"temperature",
@@ -239,9 +239,9 @@
 		printk("IRQ %d is not free.\n", irq);
 		return -EIO;
 	}
-	mouse_register(&wdt_mouse);
+	misc_register(&wdt_miscdev);
 #ifdef CONFIG_WDT_501	
-	mouse_register(&temp_mouse);
+	misc_register(&temp_miscdev);
 #endif	
 	request_region(io, 8, "wdt501");
 	return 0;
@@ -249,9 +249,9 @@
 
 void cleanup_module(void)
 {
-	mouse_deregister(&wdt_mouse);
+	misc_deregister(&wdt_miscdev);
 #ifdef CONFIG_WDT_501	
-	misc_deregister(&temp_mouse);
+	misc_deregister(&temp_miscdev);
 #endif	
 	release_region(io,8);
 	free_irq(irq, NULL);
@@ -267,9 +267,9 @@
 		printk("IRQ %d is not free.\n", irq);
 		return -EIO;
 	}
-	mouse_register(&wdt_mouse);
+	misc_register(&wdt_miscdev);
 #ifdef CONFIG_WDT_501	
-	misc_register(&temp_mouse);
+	misc_register(&temp_miscdev);
 #endif	
 	request_region(io, 8, "wdt501");
 	return 0;

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