diff options
| author | Marc Balmer <mbalmer@cvs.openbsd.org> | 2006-11-26 12:02:50 +0000 |
|---|---|---|
| committer | Marc Balmer <mbalmer@cvs.openbsd.org> | 2006-11-26 12:02:50 +0000 |
| commit | 21b5c69fb0a8e719f2e6852fd81a2167807fdc40 (patch) | |
| tree | 11fb8a9cbf8abdef373126674fb5adf8e8327fd7 /sys | |
| parent | 234d05ef74b052ef7219feb3856f44eadd6b1222 (diff) | |
Activate pwdog(4) after successful testing on i386 and macppc.
ok deraadt
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index a223f524622..8f66dead8a1 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.535 2006/11/25 20:44:30 dlg Exp $ +# $OpenBSD: GENERIC,v 1.536 2006/11/26 12:02:49 mbalmer Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -92,6 +92,7 @@ geodesc* at pci? # Geode SC1100/SCx200 IAOC #gscpm* at pci? # NS Geode SC1100 SMI/ACPI module #ichwdt* at pci? # Intel 6300ESB ICH watchdog timer wdt0 at pci? # Ind Computer Source PCI-WDT50x driver +pwdog0 at pci? # Quancom PWDOG1 watchdog timer # National Semiconductor LM7[89] and compatible hardware monitors lm0 at isa? port 0x290 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 |