summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeck <beck@openbsd.org>2007-05-28 23:50:23 +0000
committerbeck <beck@openbsd.org>2007-05-28 23:50:23 +0000
commitcf4bf8c0df5c4c859be5a6786b0c854ed1f4fc58 (patch)
treed9123162e4b5dd32f6f0e31847882c149896a072
parentbob missed a file, zap zap (diff)
downloadwireguard-openbsd-cf4bf8c0df5c4c859be5a6786b0c854ed1f4fc58.tar.xz
wireguard-openbsd-cf4bf8c0df5c4c859be5a6786b0c854ed1f4fc58.zip
Revert accidental commit of acpi enabling. don't do that yet.
-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?