summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 2fcc0ec75a8..c65253436ab 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.280 2009/11/29 21:24:26 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.281 2009/12/09 21:30:24 matthieu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -199,6 +199,8 @@ atapiscsi* at umass?
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
+uhts* at uhidev? # USB HID touch screen
+wsmouse* at uhts? mux 0
uts* at uhub? # USB touchscreen
wsmouse* at uts? mux 0
ukbd* at uhidev? # USB keyboard
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index b547b604b92..4ed7202d2dc 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.675 2009/11/26 21:15:13 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.676 2009/12/09 21:30:24 matthieu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -259,6 +259,8 @@ ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
uts* at uhub? # USB touchscreen
wsmouse* at uts? mux 0
+uhts* at uhidev? # USB HID touch screen
+wsmouse* at uhts? mux 0
ukbd* at uhidev? # USB keyboard
wskbd* at ukbd? mux 1
ucycom* at uhidev? # Cypress serial