Module Name: src
Committed By: jruoho
Date: Sun Jan 9 08:05:47 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
Remove APM. (Already commented out.)
To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/sys/arch/amd64/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.296 src/sys/arch/amd64/conf/GENERIC:1.297
--- src/sys/arch/amd64/conf/GENERIC:1.296 Wed Jan 5 20:08:12 2011
+++ src/sys/arch/amd64/conf/GENERIC Sun Jan 9 08:05:47 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.296 2011/01/05 20:08:12 jruoho Exp $
+# $NetBSD: GENERIC,v 1.297 2011/01/09 08:05:47 jruoho Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.296 $"
+#ident "GENERIC-$Revision: 1.297 $"
maxusers 64 # estimated number of users
@@ -312,16 +312,6 @@
#wmihp* at acpiwmibus? # HP WMI mappings
wmimsi* at acpiwmibus? # MSI WMI mappings
-#apm0 at mainbus0 # Advanced power management
-
-# Tuning for power management, see apm(4) for more details.
-#options APM_NO_IDLE # Don't call BIOS CPU idle function
-#options APM_V10_ONLY # Use only the APM 1.0 calls
-#options APM_NO_POWEROFF # Don't power off on halt(8)
-#options APM_POWER_PRINT # Print stats on the console
-#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
-
-
# Basic Bus Support
# PCI bus support