summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-11-26 20:13:56 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-11-26 20:13:56 +0000
commit399444cab8091e65033a91641486ca53a670ea6f (patch)
treed286845dd5d796190e9f68fca81bffbe674918ce /sys/arch/amd64
parent289d6ba1b1b9ed2725c3ee8f50b58c4c0fe12282 (diff)
Disable uscanner(4) by default on all kernels which configure it. First step
until possible removal, if indeed this causes no regression for scanner users.
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index c7599b3af87..2fafecdbe60 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.307 2010/11/05 16:58:12 damien Exp $
+# $OpenBSD: GENERIC,v 1.308 2010/11/26 20:13:55 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -224,7 +224,7 @@ mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet
url* at uhub? # Realtek RTL8150L based adapters
wi* at uhub? # WaveLAN IEEE 802.11DS
urio* at uhub? # Diamond Multimedia Rio 500
-uscanner* at uhub? # USB Scanners
+uscanner* at uhub? disable # USB Scanners
#uyap* at uhub? # Y@P firmware loader
udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio