summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorjoshua stein <jcs@cvs.openbsd.org>2014-01-20 18:27:47 +0000
committerjoshua stein <jcs@cvs.openbsd.org>2014-01-20 18:27:47 +0000
commitf6f337ccd30f3e2526e7507ba1962372c184cd57 (patch)
treebc994b0517de91d1a6a813fef28187e54933cb79 /sys/arch/i386/conf/GENERIC
parent57c8f37d58cdec77479a2c75647e7e3202bd9964 (diff)
add ubcmtp, a USB driver for Broadcom multitouch trackpads found on
newer Apple MacBook laptops enabling two-finger scrolling and other multi-finger gestures with the synaptics(4) driver mostly done at the t2k13 hackathon input from and ok mpi@
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d1db73e55df..411abf4f734 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.763 2013/12/20 21:50:49 matthew Exp $
+# $OpenBSD: GENERIC,v 1.764 2014/01/20 18:27:46 jcs Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -256,6 +256,8 @@ umidi* at uhub? # USB MIDI
midi* at umidi?
ulpt* at uhub? # USB Printers
umass* at uhub? # USB Mass Storage devices
+ubcmtp* at uhub? # Broadcom USB touchpad
+wsmouse* at ubcmtp? mux 0
uhidev* at uhub? # Human Interface Devices
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0