Module Name: src
Committed By: hauke
Date: Mon Oct 3 19:22:59 UTC 2011
Modified Files:
src/sys/arch/mac68k/conf: GENERIC SMALLRAM majors.mac68k
Log Message:
Add the MI software watchdog to GENERIC (not to SMALLRAM, as usual).
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/mac68k/conf/SMALLRAM
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mac68k/conf/majors.mac68k
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/conf/GENERIC
diff -u src/sys/arch/mac68k/conf/GENERIC:1.201 src/sys/arch/mac68k/conf/GENERIC:1.202
--- src/sys/arch/mac68k/conf/GENERIC:1.201 Thu Jun 30 20:09:32 2011
+++ src/sys/arch/mac68k/conf/GENERIC Mon Oct 3 19:22:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.201 2011/06/30 20:09:32 wiz Exp $
+# $NetBSD: GENERIC,v 1.202 2011/10/03 19:22:59 hauke Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mac68k/conf/std.mac68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.201 $"
+#ident "GENERIC-$Revision: 1.202 $"
maxusers 16 # estimated number of users
@@ -350,6 +350,7 @@ pseudo-device ite 1 # ite emulation for
pseudo-device pty # pseudo-terminals
pseudo-device clockctl # user control of clock subsystem
pseudo-device putter # for puffs and pud
+pseudo-device swwdog # software watchdog driver
# random number generator pseudo-device
pseudo-device rnd # /dev/random and in-kernel generator
Index: src/sys/arch/mac68k/conf/SMALLRAM
diff -u src/sys/arch/mac68k/conf/SMALLRAM:1.38 src/sys/arch/mac68k/conf/SMALLRAM:1.39
--- src/sys/arch/mac68k/conf/SMALLRAM:1.38 Sun Mar 6 17:08:27 2011
+++ src/sys/arch/mac68k/conf/SMALLRAM Mon Oct 3 19:22:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: SMALLRAM,v 1.38 2011/03/06 17:08:27 bouyer Exp $
+# $NetBSD: SMALLRAM,v 1.39 2011/10/03 19:22:59 hauke Exp $
#
# This is an example of how to configure a small, efficient kernel for
# a system with limited RAM. Even so it's capable of doing quite a
@@ -133,4 +133,5 @@ no pseudo-device agr
no pseudo-device accf_data
no pseudo-device accf_http
no pseudo-device putter
+no pseudo-device swwdog
no pseudo-device ksyms
Index: src/sys/arch/mac68k/conf/majors.mac68k
diff -u src/sys/arch/mac68k/conf/majors.mac68k:1.22 src/sys/arch/mac68k/conf/majors.mac68k:1.23
--- src/sys/arch/mac68k/conf/majors.mac68k:1.22 Thu Jun 30 20:09:32 2011
+++ src/sys/arch/mac68k/conf/majors.mac68k Mon Oct 3 19:22:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors.mac68k,v 1.22 2011/06/30 20:09:32 wiz Exp $
+# $NetBSD: majors.mac68k,v 1.23 2011/10/03 19:22:59 hauke Exp $
#
# Device majors for mac68k
#
@@ -49,6 +49,7 @@ device-major cgd char 51 block 23 cgd
device-major ksyms char 52 ksyms
device-major wsfont char 53 wsfont
device-major cpi char 54 cpi
+device-major sysmon char 55 sysmon_wdog
device-major nsmb char 98 nsmb
