Module Name: src
Committed By: gdt
Date: Sat Mar 19 23:21:03 UTC 2016
Modified Files:
src/sys/arch/alpha/conf: GENERIC
src/sys/arch/amd64/conf: GENERIC XEN3_DOM0
src/sys/arch/cats/conf: GENERIC
src/sys/arch/evbarm/conf: HDL_G HPT5325 SHEEVAPLUG SMDK2410
src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT PMPPC
src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX
src/sys/arch/hppa/conf: GENERIC
src/sys/arch/i386/conf: GENERIC XEN3_DOM0
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC
src/sys/arch/sgimips/conf: GENERIC32_IP3x
src/sys/arch/sparc64/conf: GENERIC
Log Message:
Disable uscanner in all kernel configs
As discussed on current-users@, SANE uses ugen via libusb and not
uscanner, so users are not well served by having uscanner. Consensus
is that addressing how to adjust permissions for scanners should not
block restoring basic functionionality.
(Compile-tested only, but there are multiple reports of this being the
right approach.)
To generate a diff of this commit:
cvs rdiff -u -r1.367 -r1.368 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.426 -r1.427 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/HDL_G
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/SMDK2410
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbppc/conf/PMPPC
cvs rdiff -u -r1.229 -r1.230 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/hpcmips/conf/TX3922
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/hpcmips/conf/VR41XX
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.1132 -r1.1133 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.320 -r1.321 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.183 -r1.184 src/sys/arch/sparc64/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/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.367 src/sys/arch/alpha/conf/GENERIC:1.368
--- src/sys/arch/alpha/conf/GENERIC:1.367 Wed Jan 20 12:49:21 2016
+++ src/sys/arch/alpha/conf/GENERIC Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.367 2016/01/20 12:49:21 jklos Exp $
+# $NetBSD: GENERIC,v 1.368 2016/03/19 23:21:02 gdt Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.367 $"
+ident "GENERIC-$Revision: 1.368 $"
maxusers 32
@@ -641,7 +641,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# Y@P firmware loader
uyap* at uhub? port ?
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.426 src/sys/arch/amd64/conf/GENERIC:1.427
--- src/sys/arch/amd64/conf/GENERIC:1.426 Wed Mar 16 16:13:16 2016
+++ src/sys/arch/amd64/conf/GENERIC Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.426 2016/03/16 16:13:16 christos Exp $
+# $NetBSD: GENERIC,v 1.427 2016/03/19 23:21:02 gdt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.426 $"
+#ident "GENERIC-$Revision: 1.427 $"
maxusers 64 # estimated number of users
@@ -1005,7 +1005,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB 802.11 adapters
athn* at uhub? port ? # Atheros AR9002U
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.116 src/sys/arch/amd64/conf/XEN3_DOM0:1.117
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.116 Tue Nov 10 13:01:41 2015
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.116 2015/11/10 13:01:41 tnn Exp $
+# $NetBSD: XEN3_DOM0,v 1.117 2016/03/19 23:21:02 gdt Exp $
include "arch/amd64/conf/std.xen"
@@ -661,7 +661,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.156 src/sys/arch/cats/conf/GENERIC:1.157
--- src/sys/arch/cats/conf/GENERIC:1.156 Sat Aug 8 06:36:25 2015
+++ src/sys/arch/cats/conf/GENERIC Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.156 2015/08/08 06:36:25 maxv Exp $
+# $NetBSD: GENERIC,v 1.157 2016/03/19 23:21:02 gdt Exp $
#
# GENERIC machine description file
#
@@ -428,7 +428,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.44 src/sys/arch/evbarm/conf/HDL_G:1.45
--- src/sys/arch/evbarm/conf/HDL_G:1.44 Wed Aug 12 07:53:57 2015
+++ src/sys/arch/evbarm/conf/HDL_G Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.44 2015/08/12 07:53:57 maxv Exp $
+# $NetBSD: HDL_G,v 1.45 2016/03/19 23:21:02 gdt Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -356,7 +356,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.25 src/sys/arch/evbarm/conf/HPT5325:1.26
--- src/sys/arch/evbarm/conf/HPT5325:1.25 Sat Aug 8 06:36:25 2015
+++ src/sys/arch/evbarm/conf/HPT5325 Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.25 2015/08/08 06:36:25 maxv Exp $
+# $NetBSD: HPT5325,v 1.26 2016/03/19 23:21:02 gdt Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -372,7 +372,7 @@ ucom* at uvisor?
#ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.47 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.48
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.47 Sat Sep 26 11:16:12 2015
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.47 2015/09/26 11:16:12 maxv Exp $
+# $NetBSD: SHEEVAPLUG,v 1.48 2016/03/19 23:21:02 gdt Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -373,7 +373,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbarm/conf/SMDK2410
diff -u src/sys/arch/evbarm/conf/SMDK2410:1.58 src/sys/arch/evbarm/conf/SMDK2410:1.59
--- src/sys/arch/evbarm/conf/SMDK2410:1.58 Wed Aug 12 07:53:57 2015
+++ src/sys/arch/evbarm/conf/SMDK2410 Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: SMDK2410,v 1.58 2015/08/12 07:53:57 maxv Exp $
+# $NetBSD: SMDK2410,v 1.59 2016/03/19 23:21:02 gdt Exp $
#
# SMDK2410 -- Samsung's S3C2410 evaluation board.
#
@@ -313,7 +313,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT
diff -u src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.18 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.19
--- src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT:1.18 Wed Oct 15 08:14:44 2014
+++ src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS266_OPT,v 1.18 2014/10/15 08:14:44 uebayasi Exp $
+# $NetBSD: OPENBLOCKS266_OPT,v 1.19 2016/03/19 23:21:02 gdt Exp $
#
include "arch/evbppc/conf/OPENBLOCKS266"
@@ -267,7 +267,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/evbppc/conf/PMPPC
diff -u src/sys/arch/evbppc/conf/PMPPC:1.35 src/sys/arch/evbppc/conf/PMPPC:1.36
--- src/sys/arch/evbppc/conf/PMPPC:1.35 Wed Oct 15 08:14:44 2014
+++ src/sys/arch/evbppc/conf/PMPPC Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: PMPPC,v 1.35 2014/10/15 08:14:44 uebayasi Exp $
+# $NetBSD: PMPPC,v 1.36 2016/03/19 23:21:02 gdt Exp $
#
# PMPPC
#
@@ -394,7 +394,7 @@ ucom* at uvisor?
#ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/hpcmips/conf/GENERIC
diff -u src/sys/arch/hpcmips/conf/GENERIC:1.229 src/sys/arch/hpcmips/conf/GENERIC:1.230
--- src/sys/arch/hpcmips/conf/GENERIC:1.229 Sun Nov 16 16:01:41 2014
+++ src/sys/arch/hpcmips/conf/GENERIC Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.229 2014/11/16 16:01:41 manu Exp $
+# $NetBSD: GENERIC,v 1.230 2016/03/19 23:21:02 gdt Exp $
#
# GENERIC machine description file
#
@@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.229 $"
+#ident "GENERIC-$Revision: 1.230 $"
maxusers 16
@@ -640,7 +640,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/hpcmips/conf/TX3922
diff -u src/sys/arch/hpcmips/conf/TX3922:1.101 src/sys/arch/hpcmips/conf/TX3922:1.102
--- src/sys/arch/hpcmips/conf/TX3922:1.101 Fri Aug 21 01:52:08 2015
+++ src/sys/arch/hpcmips/conf/TX3922 Sat Mar 19 23:21:02 2016
@@ -1,7 +1,7 @@
#
# Distribution kernel (TOSHIBA TX3922 based model) kernel config file
#
-# $NetBSD: TX3922,v 1.101 2015/08/21 01:52:08 uebayasi Exp $
+# $NetBSD: TX3922,v 1.102 2016/03/19 23:21:02 gdt Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -244,7 +244,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# Y@P firmware loader
uyap* at uhub? port ?
Index: src/sys/arch/hpcmips/conf/VR41XX
diff -u src/sys/arch/hpcmips/conf/VR41XX:1.64 src/sys/arch/hpcmips/conf/VR41XX:1.65
--- src/sys/arch/hpcmips/conf/VR41XX:1.64 Fri Aug 21 01:52:08 2015
+++ src/sys/arch/hpcmips/conf/VR41XX Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: VR41XX,v 1.64 2015/08/21 01:52:08 uebayasi Exp $
+# $NetBSD: VR41XX,v 1.65 2016/03/19 23:21:02 gdt Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/hpcmips/conf/std.hpcmips"
include "arch/hpcmips/conf/std.hpcmips.vr41"
-#ident "GENERIC-$Revision: 1.64 $"
+#ident "GENERIC-$Revision: 1.65 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -501,7 +501,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.7 src/sys/arch/hppa/conf/GENERIC:1.8
--- src/sys/arch/hppa/conf/GENERIC:1.7 Sat Sep 26 11:16:12 2015
+++ src/sys/arch/hppa/conf/GENERIC Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.7 2015/09/26 11:16:12 maxv Exp $
+# $NetBSD: GENERIC,v 1.8 2016/03/19 23:21:02 gdt Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hppa/conf/std.hppa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.7 $"
+#ident "GENERIC-$Revision: 1.8 $"
maxusers 32 # estimated number of users
@@ -680,7 +680,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1132 src/sys/arch/i386/conf/GENERIC:1.1133
--- src/sys/arch/i386/conf/GENERIC:1.1132 Sat Mar 5 17:08:48 2016
+++ src/sys/arch/i386/conf/GENERIC Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1132 2016/03/05 17:08:48 riastradh Exp $
+# $NetBSD: GENERIC,v 1.1133 2016/03/19 23:21:02 gdt 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.1132 $"
+#ident "GENERIC-$Revision: 1.1133 $"
maxusers 64 # estimated number of users
@@ -1321,7 +1321,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.97 src/sys/arch/i386/conf/XEN3_DOM0:1.98
--- src/sys/arch/i386/conf/XEN3_DOM0:1.97 Sat Sep 26 11:16:12 2015
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Mar 19 23:21:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.97 2015/09/26 11:16:12 maxv Exp $
+# $NetBSD: XEN3_DOM0,v 1.98 2016/03/19 23:21:02 gdt Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -638,7 +638,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.47 src/sys/arch/landisk/conf/GENERIC:1.48
--- src/sys/arch/landisk/conf/GENERIC:1.47 Sat Aug 8 06:36:25 2015
+++ src/sys/arch/landisk/conf/GENERIC Sat Mar 19 23:21:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.47 2015/08/08 06:36:25 maxv Exp $
+# $NetBSD: GENERIC,v 1.48 2016/03/19 23:21:03 gdt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.47 $"
+#ident "GENERIC-$Revision: 1.48 $"
maxusers 16 # estimated number of users
@@ -374,7 +374,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.320 src/sys/arch/macppc/conf/GENERIC:1.321
--- src/sys/arch/macppc/conf/GENERIC:1.320 Sun Nov 16 16:01:41 2014
+++ src/sys/arch/macppc/conf/GENERIC Sat Mar 19 23:21:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.320 2014/11/16 16:01:41 manu Exp $
+# $NetBSD: GENERIC,v 1.321 2016/03/19 23:21:03 gdt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.320 $"
+#ident "GENERIC-$Revision: 1.321 $"
maxusers 32
@@ -526,7 +526,7 @@ udav* at uhub? port ? # Davicom DM9601
ukyopon* at uhub? port ? # Kyocera AIR-EDGE PHONE
ucom* at ukyopon? portno ?
-uscanner* at uhub? port ? # USB scanners
+#uscanner* at uhub? port ? # USB scanners
uyap* at uhub? port ? # Y@P firmware loader
ugen* at uhub? port ? configuration ? interface ? # USB Generic driver
Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.107 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.108
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.107 Sat Sep 26 11:16:12 2015
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x Sat Mar 19 23:21:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.107 2015/09/26 11:16:12 maxv Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.108 2016/03/19 23:21:03 gdt Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entr
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.107 $"
+#ident "GENERIC32_IP3x-$Revision: 1.108 $"
maxusers 32
@@ -390,7 +390,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.183 src/sys/arch/sparc64/conf/GENERIC:1.184
--- src/sys/arch/sparc64/conf/GENERIC:1.183 Wed Dec 16 08:00:00 2015
+++ src/sys/arch/sparc64/conf/GENERIC Sat Mar 19 23:21:03 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.183 2015/12/16 08:00:00 jdc Exp $
+# $NetBSD: GENERIC,v 1.184 2016/03/19 23:21:03 gdt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.183 $"
+#ident "GENERIC-$Revision: 1.184 $"
maxusers 64
@@ -675,7 +675,7 @@ ukyopon* at uhub? port ?
ucom* at ukyopon? portno ?
# USB scanners
-uscanner* at uhub? port ?
+#uscanner* at uhub? port ?
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
