summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorEdd Barrett <edd@cvs.openbsd.org>2013-08-15 15:01:49 +0000
committerEdd Barrett <edd@cvs.openbsd.org>2013-08-15 15:01:49 +0000
commitdc41cbc1514613395e679f6a97e0013f6de22189 (patch)
tree9da1685b77880c08ce86c6dc927432d20069d5fc /sys/arch
parentfb93743059a155b71be5a19f1f2589bc86c365a8 (diff)
Blast uhts(4). This code was merged into ums(4) last week.
OK mpi@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/macppc/conf/GENERIC4
3 files changed, 3 insertions, 9 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 38ef9a27fbc..c0e3bc1f2e8 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.344 2013/08/13 16:26:21 mikeb Exp $
+# $OpenBSD: GENERIC,v 1.345 2013/08/15 15:01:48 edd Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -207,8 +207,6 @@ umass* at uhub? # USB Mass Storage devices
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 30a726ae18e..2361f6d976e 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.749 2013/08/13 16:26:23 mikeb Exp $
+# $OpenBSD: GENERIC,v 1.750 2013/08/15 15:01:48 edd Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -260,8 +260,6 @@ 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
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 48a3b5ab69e..80634f23b9e 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.220 2013/07/06 17:40:01 mpi Exp $g
+# $OpenBSD: GENERIC,v 1.221 2013/08/15 15:01:48 edd Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -254,8 +254,6 @@ 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