Remove the Archive/Wangtek cartidge tape driver, wt(4). All tapes are

st(4).

ok tom@ deraadt@ jason@

4 files changed, 9 insertions, 15 deletions

diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index fccb2dabd3f..abc7c0274e9 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.11 2007/02/06 22:39:13 dlg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.12 2007/05/28 02:13:44 krw Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -47,8 +47,6 @@ bdev_decl(wd);
 #include "fdc.h"
 #include "fd.h"
 bdev_decl(fd);
-#include "wt.h"
-bdev_decl(wt);
 #include "sd.h"
 #include "st.h"
 #include "cd.h"
@@ -65,7 +63,7 @@ struct bdevsw	bdevsw[] =
 	bdev_disk_init(NWD,wd),		/* 0: ST506/ESDI/IDE disk */
 	bdev_swap_init(1,sw),		/* 1: swap pseudo-device */
 	bdev_disk_init(NFD,fd),		/* 2: floppy diskette */
-	bdev_tape_init(NWT,wt),		/* 3: QIC-02/QIC-36 tape */
+	bdev_notdef(),			/* 3 */
 	bdev_disk_init(NSD,sd),		/* 4: SCSI disk */
 	bdev_tape_init(NST,st),		/* 5: SCSI tape */
 	bdev_disk_init(NCD,cd),		/* 6: SCSI CD-ROM */
@@ -77,7 +75,7 @@ struct bdevsw	bdevsw[] =
 	bdev_lkm_dummy(),		/* 12 */
 	bdev_lkm_dummy(),		/* 13 */
 	bdev_disk_init(NVND,vnd),	/* 14: vnode disk driver */
-	bdev_lkm_dummy(),	/* 15: Sony CD-ROM */
+	bdev_lkm_dummy(),		/* 15: Sony CD-ROM */
 	bdev_disk_init(NCCD,ccd),	/* 16: concatenated disk driver */
 	bdev_disk_init(NRD,rd),		/* 17: ram disk driver */
 	bdev_lkm_dummy(),		/* 18 */
@@ -189,7 +187,7 @@ struct cdevsw	cdevsw[] =
 	cdev_log_init(1,log),		/* 7: /dev/klog */
 	cdev_tty_init(NCOM,com),	/* 8: serial port */
 	cdev_disk_init(NFD,fd),		/* 9: floppy disk */
-	cdev_tape_init(NWT,wt),		/* 10: QIC-02/QIC-36 tape */
+	cdev_notdef(),			/* 10 */
 	cdev_lkm_dummy(),		/* 11: Sony CD-ROM */
 	cdev_wsdisplay_init(NWSDISPLAY,	/* 12: frame buffers, etc. */
 	    wsdisplay),
diff --git a/sys/arch/amd64/conf/files.amd64 b/sys/arch/amd64/conf/files.amd64
index c33e33019bd..c59f4bad515 100644
--- a/sys/arch/amd64/conf/files.amd64
+++ b/sys/arch/amd64/conf/files.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amd64,v 1.28 2007/05/19 19:32:03 tedu Exp $
+#	$OpenBSD: files.amd64,v 1.29 2007/05/28 02:13:44 krw Exp $
 
 maxpartitions 16
 maxusers 2 16 128
@@ -205,7 +205,6 @@ major	{st = 5}
 major	{cd = 6}
 major	{rd = 17}
 major	{wd = 0}
-major	{wt = 3}
 major	{fd = 2}
 
 file	arch/i386/pci/agp_machdep.c		pciagp
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 2b00a678498..82b75d17566 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.160 2007/05/04 13:22:21 art Exp $
+#	$OpenBSD: files.i386,v 1.161 2007/05/28 02:13:44 krw Exp $
 #
 # new style config file for i386 architecture
 #
@@ -164,7 +164,6 @@ file	dev/pci/if_hme_pci.c		hme_pci
 
 major	{mcd = 7}
 major	{wd = 0}
-major	{wt = 3}
 
 include "../../../dev/isa/files.isa"
 file	arch/i386/isa/isa_machdep.c	isabus
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 8df7f01adc0..9847771009c 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.115 2007/02/06 22:39:13 dlg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.116 2007/05/28 02:13:44 krw Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -48,8 +48,6 @@ bdev_decl(wd);
 #include "fdc.h"
 #include "fd.h"
 bdev_decl(fd);
-#include "wt.h"
-bdev_decl(wt);
 #include "sd.h"
 #include "st.h"
 #include "cd.h"
@@ -66,7 +64,7 @@ struct bdevsw	bdevsw[] =
 	bdev_disk_init(NWD,wd),		/* 0: ST506/ESDI/IDE disk */
 	bdev_swap_init(1,sw),		/* 1: swap pseudo-device */
 	bdev_disk_init(NFD,fd),		/* 2: floppy diskette */
-	bdev_tape_init(NWT,wt),		/* 3: QIC-02/QIC-36 tape */
+	bdev_notdef(),			/* 3 */
 	bdev_disk_init(NSD,sd),		/* 4: SCSI disk */
 	bdev_tape_init(NST,st),		/* 5: SCSI tape */
 	bdev_disk_init(NCD,cd),		/* 6: SCSI CD-ROM */
@@ -214,7 +212,7 @@ struct cdevsw	cdevsw[] =
 	cdev_tty_init(NCOM,com),	/* 8: serial port */
 #endif
 	cdev_disk_init(NFD,fd),		/* 9: floppy disk */
-	cdev_tape_init(NWT,wt),		/* 10: QIC-02/QIC-36 tape */
+	cdev_notdef(),			/* 10 */
 	cdev_notdef(),			/* 11 */
 	cdev_wsdisplay_init(NWSDISPLAY,	/* 12: frame buffers, etc. */
 	    wsdisplay),