diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-15 22:21:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-15 22:21:33 +0000 |
| commit | fcccf1df33c7633265f540124d1513023bf1fad4 (patch) | |
| tree | 0d5a5bd81b66e5bea3815c7b6763202cd7dab7e8 /sys/arch/amd64/conf/GENERIC | |
| parent | b15e61556ee6cb83b6558e98b1166d88949a6a11 (diff) | |
enable most acpi functionality by default. now instead of 'enable acpi',
you use 'disable acpi' or 'disable apm' withn you encounter problems
(depending on which kind of problems). if we work hard enough, this can
remain the situation by the time we ship the next release. otherwise, we
will re-disable acpi... so let's crackin'
Diffstat (limited to 'sys/arch/amd64/conf/GENERIC')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 83b043cc52f..7b94eff17f7 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.202 2007/11/03 05:46:34 beck Exp $ +# $OpenBSD: GENERIC,v 1.203 2007/11/15 22:21:31 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -39,21 +39,20 @@ isa0 at amdpcib? pci* at mainbus0 #option ACPIVERBOSE -option ACPI_ENABLE -acpi0 at mainbus? disable -acpitimer* at acpi? disable -acpihpet* at acpi? disable +acpi0 at mainbus? +acpitimer* at acpi? +acpihpet* at acpi? acpiac* at acpi? acpibat* at acpi? acpibtn* at acpi? -acpicpu* at acpi? disable +acpicpu* at acpi? #acpidock* at acpi? acpiec* at acpi? acpiprt* at acpi? acpitz* at acpi? -ipmi0 at mainbus? # IPMI +ipmi0 at mainbus? disable # IPMI option PCIVERBOSE option USBVERBOSE |