Module Name: src
Committed By: jruoho
Date: Fri Apr 1 12:11:17 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
Log Message:
Enable acpicpu(4) by default.
To generate a diff of this commit:
cvs rdiff -u -r1.317 -r1.318 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1026 -r1.1027 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.317 src/sys/arch/amd64/conf/GENERIC:1.318
--- src/sys/arch/amd64/conf/GENERIC:1.317 Sun Mar 6 17:08:19 2011
+++ src/sys/arch/amd64/conf/GENERIC Fri Apr 1 12:11:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.317 2011/03/06 17:08:19 bouyer Exp $
+# $NetBSD: GENERIC,v 1.318 2011/04/01 12:11:17 jruoho Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.317 $"
+#ident "GENERIC-$Revision: 1.318 $"
maxusers 64 # estimated number of users
@@ -79,7 +79,7 @@
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
# CPU features
-#acpicpu* at cpu? # ACPI CPU (including frequency scaling)
+acpicpu* at cpu? # ACPI CPU (including frequency scaling)
coretemp* at cpu? # Intel on-die thermal sensor
est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
#odcm0 at cpu0 # On-demand clock modulation
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1026 src/sys/arch/i386/conf/GENERIC:1.1027
--- src/sys/arch/i386/conf/GENERIC:1.1026 Sun Mar 6 17:08:25 2011
+++ src/sys/arch/i386/conf/GENERIC Fri Apr 1 12:11:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1026 2011/03/06 17:08:25 bouyer Exp $
+# $NetBSD: GENERIC,v 1.1027 2011/04/01 12:11:16 jruoho Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1026 $"
+#ident "GENERIC-$Revision: 1.1027 $"
maxusers 64 # estimated number of users
@@ -38,7 +38,7 @@
#options PAE # PAE mode (36 bits physical addressing)
# CPU features
-#acpicpu* at cpu? # ACPI CPU (including frequency scaling)
+acpicpu* at cpu? # ACPI CPU (including frequency scaling)
coretemp* at cpu? # Intel on-die thermal sensor
est0 at cpu0 # Intel Enhanced SpeedStep (non-ACPI)
#odcm0 at cpu0 # On-demand clock modulation
