Add HW_WDOG to LINT, and turn it into a new-style option.

sys/conf/NOTES

@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.406 1998/02/11 20:47:42 dima Exp $
+#	$Id: LINT,v 1.407 1998/02/13 13:00:01 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1381,6 +1381,12 @@ options		GATEWAY
 # might want to use this option.
 options		NO_LKM
 
+#
+# Add tie-ins for a hardware watchdog.  This only enable the hooks;
+# the user must still supply the actual driver.
+#
+options		HW_WDOG
+
 # More undocumented options for linting.
 
 options		CLK_CALIBRATION_LOOP

sys/conf/options

@@ -1,4 +1,4 @@
-#	$Id: options,v 1.59 1998/02/06 12:41:39 eivind Exp $
+#	$Id: options,v 1.60 1998/02/12 18:02:04 eivind Exp $
 
 # Format:
 # Option name	filename
@@ -14,6 +14,7 @@ GDB_REMOTE_CHAT	opt_ddb.h
 DEVFS
 DEVFS_ROOT	opt_devfs.h
 FAILSAFE
+HW_WDOG
 KTRACE
 MD5
 MFS_AUTOLOAD	opt_mfs.h

sys/i386/conf/LINT

@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.406 1998/02/11 20:47:42 dima Exp $
+#	$Id: LINT,v 1.407 1998/02/13 13:00:01 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1381,6 +1381,12 @@ options		GATEWAY
 # might want to use this option.
 options		NO_LKM
 
+#
+# Add tie-ins for a hardware watchdog.  This only enable the hooks;
+# the user must still supply the actual driver.
+#
+options		HW_WDOG
+
 # More undocumented options for linting.
 
 options		CLK_CALIBRATION_LOOP

sys/i386/conf/NOTES

@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.406 1998/02/11 20:47:42 dima Exp $
+#	$Id: LINT,v 1.407 1998/02/13 13:00:01 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1381,6 +1381,12 @@ options		GATEWAY
 # might want to use this option.
 options		NO_LKM
 
+#
+# Add tie-ins for a hardware watchdog.  This only enable the hooks;
+# the user must still supply the actual driver.
+#
+options		HW_WDOG
+
 # More undocumented options for linting.
 
 options		CLK_CALIBRATION_LOOP

sys/i386/isa/wd.c

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.149 1998/01/24 02:54:27 eivind Exp $
+ *	$Id: wd.c,v 1.150 1998/02/01 19:10:04 bde Exp $
  */
 
 /* TODO:
@@ -66,6 +66,7 @@
 
 #include "opt_atapi.h"
 #include "opt_devfs.h"
+#include "opt_hw_wdog.h"
 #include "opt_wd.h"
 #include "pci.h"
 

sys/kern/kern_shutdown.c

@@ -36,10 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.26 1997/11/18 15:16:43 bde Exp $
+ * $Id: kern_shutdown.c,v 1.27 1997/11/25 07:07:43 julian Exp $
  */
 
 #include "opt_ddb.h"
+#include "opt_hw_wdog.h"
 #include "opt_panic.h"
 #include "opt_show_busybufs.h"
 

sys/pc98/pc98/wd.c

@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.42 1998/01/24 06:54:17 kato Exp $
+ *	$Id: wd.c,v 1.43 1998/02/02 09:52:28 kato Exp $
  */
 
 /* TODO:
@@ -66,6 +66,7 @@
 
 #include "opt_atapi.h"
 #include "opt_devfs.h"
+#include "opt_hw_wdog.h"
 #include "opt_wd.h"
 #include "pci.h"
 

sys/scsi/sd.c

@@ -15,11 +15,12 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.119 1997/12/29 07:49:31 julian Exp $
+ *      $Id: sd.c,v 1.120 1998/01/24 02:54:52 eivind Exp $
  */
 
 #include "opt_bounce.h"
 #include "opt_devfs.h"
+#include "opt_hw_wdog.h"
 #include "opt_scsi.h"
 
 #define SPLSD splbio