summaryrefslogtreecommitdiff
path: root/sys/arch/alpha
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/alpha
parente2df4549a1a3317e395a8eb72d4bdf909b51822f (diff)
No more ss(4) or usscanner(4). Unused, unloved and unmaintained.
General huzzahs. "go for it" deraadt@
Diffstat (limited to 'sys/arch/alpha')
-rw-r--r--sys/arch/alpha/alpha/conf.c5
-rw-r--r--sys/arch/alpha/conf/GENERIC5
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG3
3 files changed, 4 insertions, 9 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 80e3193c1eb..b8deedb6a4a 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.62 2010/06/09 15:25:32 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.63 2010/07/03 03:59:16 krw Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -49,7 +49,6 @@ bdev_decl(fd);
#include "st.h"
#include "cd.h"
#include "sd.h"
-#include "ss.h"
#include "uk.h"
#include "vnd.h"
#include "raid.h"
@@ -171,7 +170,7 @@ struct cdevsw cdevsw[] =
cdev_mouse_init(NWSKBD,wskbd), /* 29: /dev/kbd XXX */
cdev_mouse_init(NWSMOUSE,wsmouse), /* 30: /dev/mouse XXX */
cdev_lpt_init(NLPT,lpt), /* 31: parallel printer */
- cdev_scanner_init(NSS,ss), /* 32: SCSI scanner */
+ cdev_notdef(), /* 32: */
cdev_uk_init(NUK,uk), /* 33: SCSI unknown */
cdev_random_init(1,random), /* 34: random data source */
cdev_pf_init(NPF, pf), /* 35: packet filter */
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 0913196e482..243fc3f4658 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.212 2010/06/30 20:38:49 tedu Exp $
+# $OpenBSD: GENERIC,v 1.213 2010/07/03 03:59:16 krw Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -114,8 +114,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
@@ -373,7 +371,6 @@ ahc* at eisa? # Adaptec 274x, aic7770 SCSI
# SCSI devices
cd* at scsibus?
sd* at scsibus?
-ss* at scsibus?
st* at scsibus?
ch* at scsibus?
safte* at scsibus?
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 8a461dc1367..82a9570c238 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.80 2009/09/27 19:30:38 sthen Exp $
+# $OpenBSD: RAMDISKBIG,v 1.81 2010/07/03 03:59:16 krw Exp $
# $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
#
# Generic Alpha kernel. Enough to get booted, etc., but not much more.
@@ -294,7 +294,6 @@ ahc* at eisa? # Adaptec 274x, aic7770 SCSI
# SCSI devices
cd* at scsibus?
sd* at scsibus?
-ss* at scsibus?
st* at scsibus?
ch* at scsibus?
uk* at scsibus?