diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-08-20 14:27:34 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-08-20 14:27:34 +0000 |
| commit | cc18e245ea95474eeddc071696fd3ee82acdc2e4 (patch) | |
| tree | 7a9fdc80881c5f5946ca0830981943efa004eb78 /sys/arch/macppc | |
| parent | cd625c9ed4d13a51a18655c873b22502f7ad625e (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/macppc')
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/conf.c | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index f34b6bb6b65..292d4b07236 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.224 2013/08/18 17:33:01 kettenis Exp $g +# $OpenBSD: GENERIC,v 1.225 2013/08/20 14:27:29 ajacoutot Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -269,7 +269,6 @@ 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? 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/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index 3c51e6f70bd..f959c4d8317 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.95 2013/08/17 08:33:11 mpi Exp $ +# $OpenBSD: RAMDISK,v 1.96 2013/08/20 14:27:29 ajacoutot Exp $ # # PPC GENERIC config file # @@ -183,7 +183,6 @@ urtwn* at uhub? # Realtek RTL8188CU/RTL8192CU zyd* at uhub? # Zydas ZD1211 url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS -#uscanner* at uhub? # USB Scanner driver #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver umass* at uhub? # USB Mass Storage devices diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c index c77e09ba637..cf9822ce0e2 100644 --- a/sys/arch/macppc/macppc/conf.c +++ b/sys/arch/macppc/macppc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.52 2013/06/03 17:33:58 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.53 2013/08/20 14:27:29 ajacoutot Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -108,7 +108,6 @@ cdev_decl(com); #include "ulpt.h" #include "urio.h" #include "ucom.h" -#include "uscanner.h" #include "inet.h" @@ -226,7 +225,7 @@ struct cdevsw cdevsw[] = { #endif cdev_notdef(), /* 72: ALTQ (deprecated) */ cdev_iop_init(NIOP,iop), /* 73: I2O IOP control interface */ - cdev_usbdev_init(NUSCANNER,uscanner), /* 74: usb scanner */ + cdev_notdef(), /* 74: was USB scanners */ cdev_bktr_init(NBKTR,bktr), /* 75: Bt848 video capture device */ cdev_radio_init(NRADIO, radio), /* 76: generic radio I/O */ cdev_ptm_init(NPTY,ptm), /* 77: pseudo-tty ptm device */ |