diff options
| author | Jordan Hargrave <jordan@cvs.openbsd.org> | 2006-11-27 19:19:10 +0000 |
|---|---|---|
| committer | Jordan Hargrave <jordan@cvs.openbsd.org> | 2006-11-27 19:19:10 +0000 |
| commit | 0a181cfe9f01881989db14fff0f96c2c8608c66b (patch) | |
| tree | dcf04e50780901c76c7078778e3e8ff1ed9288ef /sys | |
| parent | f3fd642cda2878a057bfee9fd7b4d2562d1eb4cd (diff) | |
Added support to GENERIC for disabled acpi
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 9 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC.MP | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 92244675134..deed3a40f44 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.168 2006/11/27 12:35:30 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.169 2006/11/27 19:19:09 jordan Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -43,17 +43,18 @@ isa0 at mainbus0 isa0 at pcib? pci* at mainbus0 -#option ACPIVERBOSE +option ACPIVERBOSE #option ACPI_ENABLE -#acpi0 at mainbus? +acpi0 at mainbus? disable #acpitimer* at acpi? #acpihpet* at acpi? #acpiac* at acpi? #acpibat* at acpi? #acpibtn* at acpi? #acpicpu* at acpi? -#acpiec* at acpi? +acpiec* at acpi? disable +acpiprt* at acpi? #acpitz* at acpi? ipmi0 at mainbus? # IPMI diff --git a/sys/arch/amd64/conf/GENERIC.MP b/sys/arch/amd64/conf/GENERIC.MP index 1ebf914fed2..211184d1764 100644 --- a/sys/arch/amd64/conf/GENERIC.MP +++ b/sys/arch/amd64/conf/GENERIC.MP @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC.MP,v 1.6 2005/05/24 00:51:27 brad Exp $ +# $OpenBSD: GENERIC.MP,v 1.7 2006/11/27 19:19:09 jordan Exp $ include "arch/amd64/conf/GENERIC" @@ -9,3 +9,4 @@ cpu* at mainbus? ioapic* at mainbus? aapic* at pci? # AMD 8131 IO apic +acpimadt* at acpi? |