summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
authoruaa <uaa@cvs.openbsd.org>2015-01-03 20:39:12 +0000
committeruaa <uaa@cvs.openbsd.org>2015-01-03 20:39:12 +0000
commit70813a115d9ebeab7bfeae4a76ea77300efaabd9 (patch)
treea5c144ddfd9002a4ddb63fc7b7b4b62760016ac7 /sys/arch/i386/conf
parent45636370973ecc483211981f9ddfe7dde6136d49 (diff)
add new driver uslhcom(4) USB HID based UART.
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 2b33037e605..87fa6f95ec4 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.792 2014/12/11 19:44:17 tedu Exp $
+# $OpenBSD: GENERIC,v 1.793 2015/01/03 20:39:11 uaa Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -274,6 +274,8 @@ ukbd* at uhidev? # USB keyboard
wskbd* at ukbd? mux 1
ucycom* at uhidev? # Cypress serial
ucom* at ucycom?
+uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
+ucom* at uslhcom?
uticom* at uhub? # TI serial
ucom* at uticom?
uhid* at uhidev? # USB generic HID support