summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/RAMDISKC
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-11-15 22:21:33 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-11-15 22:21:33 +0000
commitfcccf1df33c7633265f540124d1513023bf1fad4 (patch)
tree0d5a5bd81b66e5bea3815c7b6763202cd7dab7e8 /sys/arch/i386/conf/RAMDISKC
parentb15e61556ee6cb83b6558e98b1166d88949a6a11 (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/i386/conf/RAMDISKC')
-rw-r--r--sys/arch/i386/conf/RAMDISKC5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 31017f757a7..93523a15eb5 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.79 2007/11/06 22:14:54 deraadt Exp $
+# $OpenBSD: RAMDISKC,v 1.80 2007/11/15 22:21:32 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -38,8 +38,7 @@ config bsd root on rd0a swap on rd0b and wd0b and sd0b
mainbus0 at root
-option ACPI_ENABLE
-acpi0 at mainbus? disable
+acpi0 at mainbus?
#acpitimer* at acpi?
#acpihpet* at acpi?
#acpiac* at acpi?