summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2007-05-28 23:50:24 +0000
committerBob Beck <beck@cvs.openbsd.org>2007-05-28 23:50:24 +0000
commit346f6a0569d7724812f218fac3414d8df48cc87e (patch)
treeb20a9ea22c3d45cdb94e745a3c878d2b87043621 /sys
parenta86b2e59589eba3bc153144787b9d8c3dc176434 (diff)
Revert accidental commit of acpi enabling. don't do that yet.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d5b70397327..10a8187e170 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.561 2007/05/28 23:10:10 beck Exp $
+# $OpenBSD: GENERIC,v 1.562 2007/05/28 23:50:23 beck Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -61,7 +61,7 @@ pci* at mainbus0
#option ACPIVERBOSE
#option ACPI_ENABLE
-acpi0 at mainbus?
+acpi0 at mainbus? disable
#acpitimer* at acpi?
#acpihpet* at acpi?
#acpiac* at acpi?
@@ -69,7 +69,7 @@ acpi0 at mainbus?
#acpibtn* at acpi?
#acpicpu* at acpi?
#acpidock* at acpi?
-acpiec* at acpi?
+acpiec* at acpi? disable
acpiprt* at acpi?
#acpitz* at acpi?