diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2007-11-03 05:46:36 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2007-11-03 05:46:36 +0000 |
| commit | 5a5d4c7a2618ac3a50c65233046d5ecbeaee1331 (patch) | |
| tree | 8a6b7d3c141d79008426aeb9a8373066a612715a | |
| parent | 8d321ec61cdef8e60654ef9bb46cea3d32f9a997 (diff) | |
change what happens when acpi is enabled to include "relatively safe"
stuff and have acpi actually do something.
note acpi is still disabled by default, but now will do more stuff when
enabled with config -e/boot -c
ok gwk@, weingart@, canacar@, deraadt@
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 20 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 2e178329731..83b043cc52f 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.201 2007/10/14 17:39:46 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.202 2007/11/03 05:46:34 beck Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -39,19 +39,19 @@ isa0 at amdpcib? pci* at mainbus0 #option ACPIVERBOSE -#option ACPI_ENABLE +option ACPI_ENABLE acpi0 at mainbus? disable -#acpitimer* at acpi? -#acpihpet* at acpi? -#acpiac* at acpi? -#acpibat* at acpi? -#acpibtn* at acpi? -#acpicpu* at acpi? +acpitimer* at acpi? disable +acpihpet* at acpi? disable +acpiac* at acpi? +acpibat* at acpi? +acpibtn* at acpi? +acpicpu* at acpi? disable #acpidock* at acpi? -acpiec* at acpi? disable +acpiec* at acpi? acpiprt* at acpi? -#acpitz* at acpi? +acpitz* at acpi? ipmi0 at mainbus? # IPMI diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index dbcadbefb00..dd290df0c15 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.584 2007/10/28 13:42:31 ratchov Exp $ +# $OpenBSD: GENERIC,v 1.585 2007/11/03 05:46:35 beck Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -60,19 +60,19 @@ eisa0 at mainbus0 pci* at mainbus0 #option ACPIVERBOSE -#option ACPI_ENABLE +option ACPI_ENABLE acpi0 at mainbus? disable -#acpitimer* at acpi? -#acpihpet* at acpi? -#acpiac* at acpi? -#acpibat* at acpi? -#acpibtn* at acpi? -#acpicpu* at acpi? +acpitimer* at acpi? disable +acpihpet* at acpi? disable +acpiac* at acpi? +acpibat* at acpi? +acpibtn* at acpi? +acpicpu* at acpi? disable #acpidock* at acpi? -acpiec* at acpi? disable +acpiec* at acpi? acpiprt* at acpi? -#acpitz* at acpi? +acpitz* at acpi? option PCIVERBOSE option EISAVERBOSE |