patch-2.4.0-test9 linux/drivers/char/misc.c

• Lines: 46
• Date: Sun Oct 1 19:45:29 2000
• Orig file: v2.4.0-test8/linux/drivers/char/misc.c
• Orig date: Mon Jul 24 17:04:12 2000

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/char/misc.c linux/drivers/char/misc.c
@@ -70,8 +70,6 @@
 extern void gfx_register(void);
 #endif
 extern void streamable_init(void);
-extern void watchdog_init(void);
-extern void pcwatchdog_init(void);
 extern int rtc_sun_init(void);		/* Combines MK48T02 and MK48T08 */
 extern int rtc_DP8570A_init(void);
 extern int rtc_MK48T08_init(void);
@@ -81,6 +79,7 @@
 extern int pc110pad_init(void);
 extern int pmu_device_init(void);
 extern int qpmouse_init(void);
+extern int tosh_init(void);
 
 static int misc_read_proc(char *buf, char **start, off_t offset,
 			  int len, int *eof, void *private)
@@ -254,18 +253,6 @@
 #ifdef CONFIG_PC110_PAD
 	pc110pad_init();
 #endif
-/*
- *	Only one watchdog can succeed. We probe the pcwatchdog first,
- *	then the wdt cards and finally the software watchdog which always
- *	works. This means if your hardware watchdog dies or is 'borrowed'
- *	for some reason the software watchdog still gives you some cover.
- */
-#ifdef CONFIG_PCWATCHDOG
-	pcwatchdog_init();
-#endif
-#ifdef CONFIG_SOFT_WATCHDOG
-	watchdog_init();
-#endif
 #ifdef CONFIG_MVME16x
 	rtc_MK48T08_init();
 #endif
@@ -298,6 +285,9 @@
 #endif
 #ifdef CONFIG_SGI
 	streamable_init ();
+#endif
+#ifdef CONFIG_TOSHIBA
+	tosh_init();
 #endif
 	if (devfs_register_chrdev(MISC_MAJOR,"misc",&misc_fops)) {
 		printk("unable to get major %d for misc devices\n",