diff options
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/hppa/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/conf.c | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC index c1bbd6e2d3f..9aa4f5c4103 100644 --- a/sys/arch/hppa/conf/GENERIC +++ b/sys/arch/hppa/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.134 2010/06/29 20:30:32 guenther Exp $ +# $OpenBSD: GENERIC,v 1.135 2010/07/03 03:59:16 krw Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -157,8 +157,6 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' 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 @@ -357,7 +355,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? ch* at scsibus? -ss* at scsibus? safte* at scsibus? ses* at scsibus? uk* at scsibus? diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK index a8a11ec92ea..7cb5c2e6a6a 100644 --- a/sys/arch/hppa/conf/RAMDISK +++ b/sys/arch/hppa/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.89 2009/06/24 15:02:18 todd Exp $ +# $OpenBSD: RAMDISK,v 1.90 2010/07/03 03:59:16 krw Exp $ # # Diskless kernel config # @@ -154,8 +154,6 @@ upl* at uhub? # Prolific PL2301/PL2302 host-to-host `network' 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 @@ -336,7 +334,6 @@ sd* at scsibus? st* at scsibus? cd* at scsibus? #ch* at scsibus? -#ss* at scsibus? #uk* at scsibus? pseudo-device rd 1 # ramdisk diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c index b4a367c019c..9dc75e2ae13 100644 --- a/sys/arch/hppa/hppa/conf.c +++ b/sys/arch/hppa/hppa/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.50 2010/06/09 15:25:32 jsing Exp $ */ +/* $OpenBSD: conf.c,v 1.51 2010/07/03 03:59:16 krw Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -47,7 +47,6 @@ #include "st.h" #include "cd.h" #include "ch.h" -#include "ss.h" #include "uk.h" #include "wd.h" bdev_decl(wd); @@ -142,7 +141,7 @@ struct cdevsw cdevsw[] = cdev_tape_init(NST,st), /* 11: SCSI tape */ cdev_disk_init(NCD,cd), /* 12: SCSI cd-rom */ cdev_ch_init(NCH,ch), /* 13: SCSI changer */ - cdev_ss_init(NSS,ss), /* 14: SCSI scanner */ + cdev_notdef(), /* 14: */ cdev_uk_init(NUK,uk), /* 15: SCSI unknown */ cdev_fd_init(1,filedesc), /* 16: file descriptor pseudo-device */ cdev_bpf_init(NBPFILTER,bpf), /* 17: Berkeley packet filter */ |