summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2021-08-21 14:46:26 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2021-08-21 14:46:26 +0000
commitcfe83787625d008d51ad0a0b535fed82147c5ac7 (patch)
treee575ae4a00e1efde7416bf592facc9b0233c2583 /sys/arch
parentad96dc5951d6bf3d3d25e72d10dc2f0bda7b4bc9 (diff)
octeon has no wskbd, so ucc cannot link. the files.usb parts should have
handled this, but they don't. disable until this is revisited.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/octeon/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC
index e66788dcdc7..279fd6dd883 100644
--- a/sys/arch/octeon/conf/GENERIC
+++ b/sys/arch/octeon/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.59 2021/08/20 05:23:19 anton Exp $
+# $OpenBSD: GENERIC,v 1.60 2021/08/21 14:46:25 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -156,8 +156,8 @@ uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
ucom* at uslhcom?
uhid* at uhidev? # USB generic HID support
fido* at uhidev? # FIDO/U2F security key support
-ucc* at uhidev? # Consumer Control keyboards
-wskbd* at ucc? mux 1
+#ucc* at uhidev? # Consumer Control keyboards
+#wskbd* at ucc? mux 1
ujoy* at uhidev? # USB joystick/gamecontroller support
uhidpp* at uhidev? # Logitech HID++ Devices
upd* at uhidev? # USB Power Devices sensors