summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/armish/conf/GENERIC4
-rw-r--r--sys/arch/hppa/conf/GENERIC4
-rw-r--r--sys/arch/landisk/conf/GENERIC4
-rw-r--r--sys/arch/macppc/conf/GENERIC4
-rw-r--r--sys/arch/sparc64/conf/GENERIC4
-rw-r--r--sys/arch/zaurus/conf/GENERIC4
8 files changed, 24 insertions, 8 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 6f4f2752ba5..37aaccd2748 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.251 2014/12/24 18:46:14 miod Exp $
+# $OpenBSD: GENERIC,v 1.252 2015/01/03 21:24:19 uaa Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -98,6 +98,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?
uhid* at uhidev? # USB generic HID support
upd* at uhidev? # USB Power Devices sensors
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index d47d0fcc7d2..2de714822d5 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.382 2014/12/11 19:44:17 tedu Exp $
+# $OpenBSD: GENERIC,v 1.383 2015/01/03 21:24:19 uaa Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -223,6 +223,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?
uhid* at uhidev? # USB generic HID support
upd* at uhidev? # USB Power Devices sensors
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 69d563ad13b..3518d5797a3 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.57 2014/12/11 19:44:17 tedu Exp $
+# $OpenBSD: GENERIC,v 1.58 2015/01/03 21:24:19 uaa Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -129,6 +129,8 @@ udl* at uhub? # USB DisplayLink video
wsdisplay* at udl?
ucycom* at uhidev? # Cypress serial
ucom* at ucycom?
+uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
+ucom* at uslhcom?
uhid* at uhidev? # USB generic HID support
upd* at uhidev? # USB Power Devices sensors
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 13f35818b54..848970bc49f 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.167 2014/12/11 19:44:17 tedu Exp $
+# $OpenBSD: GENERIC,v 1.168 2015/01/03 21:24:19 uaa Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -137,6 +137,8 @@ umsm* at uhub? # Qualcomm MSM EVDO
ucom* at umsm?
ucycom* at uhidev? # Cypress serial
ucom* at ucycom?
+uslhcom* at uhidev? # Silicon Labs CP2110 USB HID UART
+ucom* at uslhcom?
uchcom* at uhub? # WinChipHead CH341/340 serial
ucom* at uchcom?
uaudio* at uhub? # USB Audio
diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC
index 9c51c24db48..3c241fb7f34 100644
--- a/sys/arch/landisk/conf/GENERIC
+++ b/sys/arch/landisk/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.47 2014/12/11 19:44:17 tedu Exp $
+# $OpenBSD: GENERIC,v 1.48 2015/01/03 21:24:19 uaa Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -127,6 +127,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?
uhid* at uhidev? # USB generic HID support
upd* at uhidev? # USB Power Devices sensors
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index ae5fe88a30c..9eb345c0f17 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.245 2014/12/11 19:44:17 tedu Exp $g
+# $OpenBSD: GENERIC,v 1.246 2015/01/03 21:24:19 uaa Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -251,6 +251,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?
uhid* at uhidev? # USB generic HID support
upd* at uhidev? # USB Power Devices sensors
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 974c64b5a76..dfc40255dc6 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.294 2014/12/11 19:44:17 tedu Exp $
+# $OpenBSD: GENERIC,v 1.295 2015/01/03 21:24:19 uaa Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -207,6 +207,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?
uhid* at uhidev? # USB generic HID support
upd* at uhidev? # USB Power Devices sensors
aue* at uhub? # ADMtek AN986 Pegasus Ethernet
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index b03876442c4..ee5e2e5d32f 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.97 2014/12/11 19:44:17 tedu Exp $
+# $OpenBSD: GENERIC,v 1.98 2015/01/03 21:24:19 uaa Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -105,6 +105,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?
uhid* at uhidev? # USB generic HID support
upd* at uhidev? # USB Power Devices sensors
aue* at uhub? # ADMtek AN986 Pegasus Ethernet