Add ACPI_DISABLE_ON_POWEROFF option.

This commit is contained in:
kochi 2004-06-07 15:33:52 +00:00
parent 71dc5a9687
commit 7e55bddc3a
2 changed files with 7 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.609 2004/06/01 16:29:36 augustss Exp $
# $NetBSD: GENERIC,v 1.610 2004/06/07 15:33:52 kochi Exp $
#
# GENERIC machine description file
#
@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.609 $"
#ident "GENERIC-$Revision: 1.610 $"
maxusers 32 # estimated number of users
@ -282,6 +282,7 @@ cpu* at mainbus?
#options ACPI_PCI_FIXUP # PCI interrupt routing via ACPI
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
#options ACPI_DISABLE_ON_POWEROFF # disable acpi on power off
# ACPI devices
#acpiacad* at acpi? # ACPI AC Adapter

View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_LAPTOP,v 1.94 2004/05/22 03:16:26 grant Exp $
# $NetBSD: GENERIC_LAPTOP,v 1.95 2004/06/07 15:33:52 kochi Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
#
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#ident "GENERIC-$Revision: 1.94 $"
#ident "GENERIC-$Revision: 1.95 $"
maxusers 32 # estimated number of users
@ -222,6 +222,8 @@ apm0 at mainbus0 # Advanced power management
#acpi0 at mainbus0
#options ACPI_PCI_FIXUP # PCI interrupt routing via ACPI
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
#options ACPI_DISABLE_ON_POWEROFF # disable acpi on power off
# ACPI devices
#acpiacad* at acpi? # ACPI AC Adapter