summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/conf
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2005-12-20 01:36:11 +0000
committerBrad Smith <brad@cvs.openbsd.org>2005-12-20 01:36:11 +0000
commite47ada1ca26cd8d08b92e386a77f46d30b2ac5a9 (patch)
treecbfe4af9f8fc7c5baa242192a2758af2d5549ed0 /sys/arch/macppc/conf
parent3c485bbcfcf0acb534dd5bbb04bddb25d4f88d50 (diff)
Add a Apple touchpad driver for newer PowerBook's and iBook's.
From Johan Wallén on NetBSD's macppc list. ok deraadt@
Diffstat (limited to 'sys/arch/macppc/conf')
-rw-r--r--sys/arch/macppc/conf/GENERIC4
-rw-r--r--sys/arch/macppc/conf/files.macppc6
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index f35120a2186..3c3add7b498 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.114 2005/11/20 20:23:46 brad Exp $g
+# $OpenBSD: GENERIC,v 1.115 2005/12/20 01:36:10 brad Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -222,6 +222,8 @@ umass* at uhub? # USB Mass Storage devices
scsibus* at umass?
atapiscsi* at umass?
uhidev* at uhub? # Human Interface Devices
+tpms* at uhidev? # Apple trackpad mouse
+wsmouse* at ums? mux 0
ums* at uhidev? # USB mouse
wsmouse* at ums? mux 0
ukbd* at uhidev? # USB keyboard
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index 556bd6c90a7..d6c91c67f3e 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: files.macppc,v 1.41 2005/11/19 00:43:41 kettenis Exp $
+# $OpenBSD: files.macppc,v 1.42 2005/12/20 01:36:10 brad Exp $
#
# macppc-specific configuration info
@@ -291,3 +291,7 @@ file dev/ic/hme.c
attach hme at pci with hme_pci
file dev/pci/if_hme_pci.c hme_pci
+
+device tpms: hid, wsmousedev
+attach tpms at uhidbus
+file arch/macppc/dev/tpms.c tpms