summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcs <jcs@openbsd.org>2016-07-15 14:40:15 +0000
committerjcs <jcs@openbsd.org>2016-07-15 14:40:15 +0000
commit88aea767cbb3cffddb37f139c29cc1894bc00218 (patch)
tree51172a2d4fd21ecd340daa96934c445ce3aecd5b
parentTweak output of environment logging. (diff)
downloadwireguard-openbsd-88aea767cbb3cffddb37f139c29cc1894bc00218.tar.xz
wireguard-openbsd-88aea767cbb3cffddb37f139c29cc1894bc00218.zip
disable acpicbkbd by default until after the release when acpi ec
issues can be worked out, otherwise this driver will cause the kernel to spin forever on certain chromebooks
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 04f24ce86c6..8eb1b13388b 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.424 2016/07/13 21:59:35 mikeb Exp $
+# $OpenBSD: GENERIC,v 1.425 2016/07/15 14:40:15 jcs Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -64,7 +64,7 @@ aibs* at acpi?
bytgpio* at acpi?
chvgpio* at acpi?
sdhc* at acpi?
-acpicbkbd* at acpi?
+#acpicbkbd* at acpi?
mpbios0 at bios0