summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 31a07e08513..ccd00333035 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.181 2007/05/19 19:32:03 tedu Exp $
+# $OpenBSD: GENERIC,v 1.182 2007/05/22 09:18:45 robert Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -168,6 +168,8 @@ atapiscsi* at umass?
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
+uts* at uhub? # USB touchscreen
+wsmouse* at uts? mux 0
ukbd* at uhidev? # USB keyboard
wskbd* at ukbd? mux 1
ucycom* at uhidev? # Cypress serial
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 6473ec7415f..2627af8be0e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.555 2007/04/26 01:43:13 gwk Exp $
+# $OpenBSD: GENERIC,v 1.556 2007/05/22 09:18:44 robert Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -223,6 +223,8 @@ atapiscsi* at umass?
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
+uts* at uhub? # USB touchscreen
+wsmouse* at uts? mux 0
ukbd* at uhidev? # USB keyboard
wskbd* at ukbd? mux 1
ucycom* at uhidev? # Cypress serial