summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2016-09-12 08:28:44 +0000
committermpi <mpi@openbsd.org>2016-09-12 08:28:44 +0000
commite90f38f451e31799d9cfaf00f74b5dafd5ce17fc (patch)
treeda7e04290ee6571cf55e734fe2f39ac99c76d4fe
parentWacom USB tablet driver from Frank Groeneveld. (diff)
downloadwireguard-openbsd-e90f38f451e31799d9cfaf00f74b5dafd5ce17fc.tar.xz
wireguard-openbsd-e90f38f451e31799d9cfaf00f74b5dafd5ce17fc.zip
Enable uwacom(4) where uts(4) is already present.
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/armv7/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/macppc/conf/GENERIC4
4 files changed, 12 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index e7f5d98e15e..6677dbcb463 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.432 2016/09/04 10:22:05 tedu Exp $
+# $OpenBSD: GENERIC,v 1.433 2016/09/12 08:28:44 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -248,6 +248,8 @@ ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
uts* at uhub? # USB touchscreen
wsmouse* at uts? mux 0
+uwacom* at uhidev? # USB Wacom tablet
+wsmouse* at uwacom? mux 0
ukbd* at uhidev? # USB keyboard
wskbd* at ukbd? mux 1
ucycom* at uhidev? # Cypress serial
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC
index c8b3d9c2e49..b142f4eec10 100644
--- a/sys/arch/armv7/conf/GENERIC
+++ b/sys/arch/armv7/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.52 2016/08/21 06:36:23 jsg Exp $
+# $OpenBSD: GENERIC,v 1.53 2016/09/12 08:28:44 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -194,6 +194,8 @@ ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
uts* at uhub? # USB touchscreen
wsmouse* at uts? mux 0
+uwacom* at uhidev? # USB Wacom tablet
+wsmouse* at uwacom? 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 a0cddb1daa1..808917af519 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.822 2016/09/04 10:22:06 tedu Exp $
+# $OpenBSD: GENERIC,v 1.823 2016/09/12 08:28:44 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -272,6 +272,8 @@ ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
uts* at uhub? # USB touchscreen
wsmouse* at uts? mux 0
+uwacom* at uhidev? # USB Wacom tablet
+wsmouse* at uwacom? 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 a52fce93833..d0fbcaa5fde 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.259 2016/09/04 10:22:06 tedu Exp $g
+# $OpenBSD: GENERIC,v 1.260 2016/09/12 08:28:44 mpi Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -250,6 +250,8 @@ ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
uts* at uhub? # USB touchscreen
wsmouse* at uts? mux 0
+uwacom* at uhidev? # USB Wacom tablet
+wsmouse* at uwacom? mux 0
ukbd* at uhidev? # USB keyboard
wskbd* at ukbd? mux 1
ucycom* at uhidev? # Cypress serial