--- src/usr.bin/mt/mt.c	2005/08/04 17:31:23	1.6
+++ src/usr.bin/mt/mt.c	2005/09/10 21:03:27	1.7
@@ -321,25 +321,11 @@ main(int argc, char **argv)
 	/* NOTREACHED */
 }
 
-#ifdef vax
-#include <vax/mba/mtreg.h>
-#include <vax/mba/htreg.h>
-
-#include <vax/uba/utreg.h>
-#include <vax/uba/tmreg.h>
-#undef b_repcnt		/* argh */
-#include <vax/uba/tsreg.h>
-#endif
-
 #ifdef sun
 #include <sundev/tmreg.h>
 #include <sundev/arreg.h>
 #endif
 
-#ifdef tahoe
-#include <tahoe/vba/cyreg.h>
-#endif
-
 #if defined(__DragonFly__) && defined(__i386__)
 #include <machine/wtio.h>
 #endif
@@ -350,20 +336,10 @@ struct tape_desc {
 	char	*t_dsbits;	/* "drive status" register */
 	char	*t_erbits;	/* "error" register */
 } tapes[] = {
-#ifdef vax
-	{ MT_ISTS,	"ts11",		0,		TSXS0_BITS },
-	{ MT_ISHT,	"tm03",		HTDS_BITS,	HTER_BITS },
-	{ MT_ISTM,	"tm11",		0,		TMER_BITS },
-	{ MT_ISMT,	"tu78",		MTDS_BITS,	0 },
-	{ MT_ISUT,	"tu45",		UTDS_BITS,	UTER_BITS },
-#endif
 #ifdef sun
 	{ MT_ISCPC,	"TapeMaster",	TMS_BITS,	0 },
 	{ MT_ISAR,	"Archive",	ARCH_CTRL_BITS,	ARCH_BITS },
 #endif
-#ifdef tahoe
-	{ MT_ISCY,	"cipher",	CYS_BITS,	CYCW_BITS },
-#endif
 #if defined (__DragonFly__)
 	/*
 	 * XXX This is weird.  The st driver reports the tape drive