diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index a280478ecfb..71ea77723b7 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.686 2010/07/03 01:02:25 mlarkin Exp $ +# $OpenBSD: GENERIC,v 1.687 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -283,8 +283,6 @@ 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 -usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio @@ -519,7 +517,6 @@ sd* at scsibus? # SCSI disk drives st* at scsibus? # SCSI tape drives cd* at scsibus? # SCSI CD-ROM drives ch* at scsibus? # SCSI autochangers -ss* at scsibus? # SCSI scanners safte* at scsibus? # SCSI accessed fault-tolerant enclosures ses* at scsibus? # SCSI enclosure services uk* at scsibus? # unknown SCSI diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 4d471d0fa55..69fc33396c4 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.177 2010/07/03 01:48:18 matthew Exp $ +# $OpenBSD: RAMDISK_CD,v 1.178 2010/07/03 03:59:16 krw Exp $ machine i386 # architecture, used by config; REQUIRED @@ -140,8 +140,6 @@ mos* at uhub? # MOSCHIP MCS7730/7830 10/100 Ethernet url* at uhub? # Realtek RTL8150L based adapters wi* at uhub? # WaveLAN IEEE 802.11DS #uscanner* at uhub? # USB Scanners -#usscanner* at uhub? # USB SCSI scanners, e.g., HP5300 -#scsibus* at usscanner? #uyap* at uhub? # Y@P firmware loader #ugen* at uhub? # USB Generic driver ural* at uhub? # Ralink RT2500 diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index eb7f434fbba..b1a15a69c03 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.133 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.134 2010/07/03 03:59:16 krw Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -122,7 +122,6 @@ cdev_decl(wd); #include "com.h" cdev_decl(com); cdev_decl(fd); -#include "ss.h" #include "lpt.h" cdev_decl(lpt); #include "ch.h" @@ -217,7 +216,7 @@ struct cdevsw cdevsw[] = cdev_lpt_init(NLPT,lpt), /* 16: parallel printer */ cdev_ch_init(NCH,ch), /* 17: SCSI autochanger */ cdev_disk_init(NCCD,ccd), /* 18: concatenated disk driver */ - cdev_ss_init(NSS,ss), /* 19: SCSI scanner */ + cdev_notdef(), /* 19 */ cdev_uk_init(NUK,uk), /* 20: unknown SCSI */ cdev_acpiapm_init(1,acpiapm), /* 21: Power Management stuff */ cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ |