summaryrefslogtreecommitdiff
path: root/sys/arch/armish/conf
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2013-08-20 14:27:34 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2013-08-20 14:27:34 +0000
commitcc18e245ea95474eeddc071696fd3ee82acdc2e4 (patch)
tree7a9fdc80881c5f5946ca0830981943efa004eb78 /sys/arch/armish/conf
parentcd625c9ed4d13a51a18655c873b22502f7ad625e (diff)
Remove uscanner(4). It was disabled in GENERIC more than 2.5 years ago.
No regression has been reported since libusb became the prefered solution to work with USB scanners. req. by mpi@ ok ian@ mpi@ miod@
Diffstat (limited to 'sys/arch/armish/conf')
-rw-r--r--sys/arch/armish/conf/GENERIC3
-rw-r--r--sys/arch/armish/conf/RAMDISK3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/armish/conf/GENERIC b/sys/arch/armish/conf/GENERIC
index 6d5c058e551..1b34df22a16 100644
--- a/sys/arch/armish/conf/GENERIC
+++ b/sys/arch/armish/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.47 2012/09/27 14:01:35 jsg Exp $
+# $OpenBSD: GENERIC,v 1.48 2013/08/20 14:27:26 ajacoutot Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -143,7 +143,6 @@ udav* at uhub? # Davicom DM9601 based 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? disable # USB Scanners
#uyap* at uhub? # Y@P firmware loader
udsbr* at uhub? # D-Link DSB-R100 radio
radio* at udsbr? # USB radio
diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK
index a8a80a952b4..308b0bf8e26 100644
--- a/sys/arch/armish/conf/RAMDISK
+++ b/sys/arch/armish/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.25 2012/09/27 14:01:35 jsg Exp $
+# $OpenBSD: RAMDISK,v 1.26 2013/08/20 14:27:26 ajacoutot Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -136,7 +136,6 @@ udav* at uhub? # Davicom DM9601 based 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
#uyap* at uhub? # Y@P firmware loader
#udsbr* at uhub? # D-Link DSB-R100 radio
#radio* at udsbr? # USB radio