patch-1.3.68 linux/drivers/char/softdog.c

• Lines: 25
• Date: Wed Feb 21 13:12:18 1996
• Orig file: v1.3.67/linux/drivers/char/softdog.c
• Orig date: Wed Feb 7 15:11:23 1996

diff -u --recursive --new-file v1.3.67/linux/drivers/char/softdog.c linux/drivers/char/softdog.c
@@ -18,12 +18,13 @@
  *	driver this won't always recover a failed machine.
  */
  
- 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/mouse.h>
+
 #define WATCHDOG_MINOR	130
 #define TIMER_MARGIN	(60*HZ)		/* Allow 1 minute */
 
@@ -68,7 +69,9 @@
 	/*
 	 *	Shut off the timer.
 	 */
+#ifndef CONFIG_WATCHDOG_NOWAYOUT	 
 	del_timer(&watchdog_ticktock);
+#endif	
 	timer_alive=0;
 }