Module Name: src
Committed By: jmcneill
Date: Mon Jan 17 15:56:04 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC
Log Message:
add acpiwdrt
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.284 -r1.285 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1006 -r1.1007 src/sys/arch/i386/conf/GENERIC
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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.298 src/sys/arch/amd64/conf/GENERIC:1.299
--- src/sys/arch/amd64/conf/GENERIC:1.298 Sun Jan 9 15:12:33 2011
+++ src/sys/arch/amd64/conf/GENERIC Mon Jan 17 15:56:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.298 2011/01/09 15:12:33 jruoho Exp $
+# $NetBSD: GENERIC,v 1.299 2011/01/17 15:56:03 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.298 $"
+#ident "GENERIC-$Revision: 1.299 $"
maxusers 64 # estimated number of users
@@ -285,6 +285,7 @@
acpitz* at acpi? # ACPI Thermal Zone
acpivga* at acpi? # ACPI Display Adapter
acpiout* at acpivga? # ACPI Display Output Device
+acpiwdrt* at acpi? # ACPI Watchdog Resource Table
acpiwmi* at acpi? # ACPI WMI Mapper
# Mainboard devices
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.284 src/sys/arch/i386/conf/ALL:1.285
--- src/sys/arch/i386/conf/ALL:1.284 Sun Jan 9 15:12:33 2011
+++ src/sys/arch/i386/conf/ALL Mon Jan 17 15:56:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.284 2011/01/09 15:12:33 jruoho Exp $
+# $NetBSD: ALL,v 1.285 2011/01/17 15:56:03 jmcneill Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.284 $"
+#ident "ALL-$Revision: 1.285 $"
maxusers 64 # estimated number of users
@@ -376,6 +376,7 @@
acpitz* at acpi? # ACPI Thermal Zone
acpivga* at acpi? # ACPI Display Adapter
acpiout* at acpivga? # ACPI Display Output Device
+acpiwdrt* at acpi? # ACPI Watchdog Resource Table
acpiwmi* at acpi? # ACPI WMI Mapper
# Mainboard devices
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1006 src/sys/arch/i386/conf/GENERIC:1.1007
--- src/sys/arch/i386/conf/GENERIC:1.1006 Sun Jan 9 15:12:33 2011
+++ src/sys/arch/i386/conf/GENERIC Mon Jan 17 15:56:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1006 2011/01/09 15:12:33 jruoho Exp $
+# $NetBSD: GENERIC,v 1.1007 2011/01/17 15:56:03 jmcneill Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1006 $"
+#ident "GENERIC-$Revision: 1.1007 $"
maxusers 64 # estimated number of users
@@ -365,6 +365,7 @@
acpitz* at acpi? # ACPI Thermal Zone
acpivga* at acpi? # ACPI Display Adapter
acpiout* at acpivga? # ACPI Display Output Device
+acpiwdrt* at acpi? # ACPI Watchdog Resource Table
acpiwmi* at acpi? # ACPI WMI Mapper
# Mainboard devices
