summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorJoshua Stein <jcs@cvs.openbsd.org>2016-07-15 14:40:16 +0000
committerJoshua Stein <jcs@cvs.openbsd.org>2016-07-15 14:40:16 +0000
commit9a0bbe87bf9f88b35369a284b5a5aefecc0150cb (patch)
tree316fda61c5ad9cf826b1d2e839068a81a0c39260 /sys/arch/amd64/conf
parent38ff839da8e195612190346b4849f017205b4a12 (diff)
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
Diffstat (limited to 'sys/arch/amd64/conf')
-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