Module Name: src
Committed By: martin
Date: Sun Aug 12 18:41:36 UTC 2012
Modified Files:
src/sys/arch/i386/conf [netbsd-6]: GENERIC
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #474):
sys/arch/i386/conf/GENERIC: revision 1.1078
Add uts(4)
To generate a diff of this commit:
cvs rdiff -u -r1.1066.2.5 -r1.1066.2.6 src/sys/arch/i386/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1066.2.5 src/sys/arch/i386/conf/GENERIC:1.1066.2.6
--- src/sys/arch/i386/conf/GENERIC:1.1066.2.5 Fri Jun 15 08:48:46 2012
+++ src/sys/arch/i386/conf/GENERIC Sun Aug 12 18:41:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1066.2.5 2012/06/15 08:48:46 sborrill Exp $
+# $NetBSD: GENERIC,v 1.1066.2.6 2012/08/12 18:41:35 martin Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1066.2.5 $"
+#ident "GENERIC-$Revision: 1.1066.2.6 $"
maxusers 64 # estimated number of users
@@ -1152,6 +1152,10 @@ uhidev* at uhub? port ? configuration ?
ums* at uhidev? reportid ?
wsmouse* at ums? mux 0
+# USB generic touchscreen
+uts* at uhidev? reportid ?
+wsmouse* at uts? mux 0
+
# USB eGalax touch-panel
uep* at uhub? port ?
wsmouse* at uep? mux 0
