summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2010-07-03 03:59:18 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2010-07-03 03:59:18 +0000
commitef028b2fac50f29ad9db7a6e59de228a1c13ea76 (patch)
tree6561605fb0fb34d75a51ce94e51b54d512347753 /sys/arch/sparc64
parente2df4549a1a3317e395a8eb72d4bdf909b51822f (diff)
No more ss(4) or usscanner(4). Unused, unloved and unmaintained.
General huzzahs. "go for it" deraadt@
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r--sys/arch/sparc64/conf/GENERIC5
-rw-r--r--sys/arch/sparc64/sparc64/conf.c5
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index e941a99722a..9a80595d6c8 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.251 2010/03/03 20:57:28 mk Exp $
+# $OpenBSD: GENERIC,v 1.252 2010/07/03 03:59:17 krw Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -238,8 +238,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
@@ -420,7 +418,6 @@ sd* at scsibus? # SCSI disks
st* at scsibus? # SCSI tapes
cd* at scsibus? # SCSI CD-ROMs
ch* at scsibus? # SCSI changer devices
-ss* at scsibus? # SCSI scanners
safte* at scsibus? # SCSI accessed fault-tolerant encl
ses* at scsibus? # SCSI enclosure services
uk* at scsibus? # unknown SCSI devices
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 833c710f9ea..c93b5f8cf73 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.55 2010/06/09 15:25:33 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.56 2010/07/03 03:59:17 krw Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -60,7 +60,6 @@
#include "vnd.h"
#include "ccd.h"
#include "ch.h"
-#include "ss.h"
#include "sd.h"
#include "st.h"
#include "cd.h"
@@ -222,7 +221,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 56 */
cdev_notdef(), /* 57 */
cdev_disk_init(NCD,cd), /* 58: SCSI CD-ROM */
- cdev_scanner_init(NSS,ss), /* 59: SCSI scanner */
+ cdev_notdef(), /* 59 */
cdev_uk_init(NUK,uk), /* 60: SCSI unknown */
cdev_disk_init(NRD,rd), /* 61: memory disk */
cdev_notdef(), /* 62 */