[src/netbsd-6]: src/sys/arch/i386/conf Pull up following revision(s) (request...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d0ace04170d6
branches:  netbsd-6
changeset: 774416:d0ace04170d6
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Aug 12 18:41:35 2012 +0000

description:
Pull up following revision(s) (requested by sborrill in ticket #474):
        sys/arch/i386/conf/GENERIC: revision 1.1078
Add uts(4)

diffstat:

 sys/arch/i386/conf/GENERIC |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 9df8b00b21ec -r d0ace04170d6 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Aug 12 14:48:46 2012 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Aug 12 18:41:35 2012 +0000
@@ -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 @@
 
 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 @@
 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