summaryrefslogtreecommitdiff
path: root/sys/arch/macppc
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2006-11-26 12:02:50 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2006-11-26 12:02:50 +0000
commit21b5c69fb0a8e719f2e6852fd81a2167807fdc40 (patch)
tree11fb8a9cbf8abdef373126674fb5adf8e8327fd7 /sys/arch/macppc
parent234d05ef74b052ef7219feb3856f44eadd6b1222 (diff)
Activate pwdog(4) after successful testing on i386 and macppc.
ok deraadt
Diffstat (limited to 'sys/arch/macppc')
-rw-r--r--sys/arch/macppc/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index e6cb848b5c5..80481d949f3 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.152 2006/11/07 20:47:10 kettenis Exp $g
+# $OpenBSD: GENERIC,v 1.153 2006/11/26 12:02:49 mbalmer Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -130,6 +130,7 @@ lofn* at pci? # Hifn6500
hifn* at pci? # Hifn7751/7811/7951
ubsec* at pci? # Broadcom 58xx
safe* at pci? # SafeNet SafeXcel 1141/1741
+pwdog0 at pci? # Quancom PWDOG1 watchdog timer
macintr0 at macobio? # old interrupt controller
openpic* at macobio? # openpic interrupt controller
@@ -145,7 +146,6 @@ wi* at macobio? # airport
macgpio* at macobio? # GPIO, PMU interrupt router.
macgpio* at macgpio? # GPIO, PMU interrupt router.
akbd* at adb? # ADB keyboard
-
wskbd* at akbd? mux 1
ams* at adb? # ADB mouse
wsmouse* at ams? mux 0