From af1cf8b22af31416bf5a567f4a50ab5dc8eb804e Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Mon, 28 Jul 2008 01:21:39 +0000
Subject: [PATCH] Remove some old driver remains.

---
 sys/bus/isa/i386/isa_compat.h | 24 +-----------------------
 sys/conf/files                |  4 +---
 sys/platform/pc32/conf/files  |  3 +--
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/sys/bus/isa/i386/isa_compat.h b/sys/bus/isa/i386/isa_compat.h
index 7f3774dd05..e12ddf9205 100644
--- a/sys/bus/isa/i386/isa_compat.h
+++ b/sys/bus/isa/i386/isa_compat.h
@@ -24,15 +24,13 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/isa/isa_compat.h,v 1.27.2.11 2002/10/05 18:31:48 scottl Exp $
- * $DragonFly: src/sys/bus/isa/i386/isa_compat.h,v 1.12 2007/08/29 15:42:05 swildner Exp $
+ * $DragonFly: src/sys/bus/isa/i386/isa_compat.h,v 1.13 2008/07/28 01:21:39 swildner Exp $
  */
 
-#include "use_vt.h"
 #include "use_cx.h"
 #include "use_el.h"
 #include "use_le.h"
 #include "use_rdp.h"
-#include "use_pcm.h"
 #include "use_wt.h"
 #include "use_ctx.h"
 #include "use_spigot.h"
@@ -52,13 +50,10 @@ struct old_isa_driver {
 	struct isa_driver	*driver;
 };
 
-extern struct isa_driver  vtdriver;
 extern struct isa_driver  cxdriver;
 extern struct isa_driver  eldriver;
 extern struct isa_driver  ledriver;
 extern struct isa_driver rdpdriver;
-extern struct isa_driver mcddriver;
-extern struct isa_driver scddriver;
 extern struct isa_driver  wtdriver;
 extern struct isa_driver ctxdriver;
 extern struct isa_driver spigotdriver;
@@ -68,12 +63,10 @@ extern struct isa_driver  cydriver;
 extern struct isa_driver dgbdriver;
 extern struct isa_driver labpcdriver;
 extern struct isa_driver  rcdriver;
-extern struct isa_driver  rpdriver;
 extern struct isa_driver  twdriver;
 extern struct isa_driver ascdriver;
 extern struct isa_driver stldriver;
 extern struct isa_driver stlidriver;
-extern struct isa_driver lorandriver;
 
 
 static struct old_isa_driver old_drivers[] = {
@@ -91,9 +84,6 @@ static struct old_isa_driver old_drivers[] = {
 
 /* TTY */
 
-#if NVT > 0
-	{ 0, &vtdriver },
-#endif
 #if NGP > 0
 	{ 0, &gpdriver },
 #endif
@@ -112,9 +102,6 @@ static struct old_isa_driver old_drivers[] = {
 #if NRC > 0
 	{ 0, &rcdriver },
 #endif
-#if NRP > 0
-	{ 0, &rpdriver },
-#endif
 #if NTW > 0
 	{ 0, &twdriver },
 #endif
@@ -127,18 +114,9 @@ static struct old_isa_driver old_drivers[] = {
 #if NSTLI > 0
 	{ 0, &stlidriver },
 #endif
-#if NLORAN > 0
-	{ INTR_FAST, &lorandriver },
-#endif
 
 /* BIO */
 
-#if NMCD > 0
-	{ 0, &mcddriver },
-#endif
-#if NSCD > 0
-	{ 0, &scddriver },
-#endif
 #if NWT > 0
 	{ 0, &wtdriver },
 #endif
diff --git a/sys/conf/files b/sys/conf/files
index ccbe870505..7ca23203c1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,5 +1,5 @@
 # $FreeBSD: src/sys/conf/files,v 1.340.2.137 2003/06/04 17:10:30 sam Exp $
-# $DragonFly: src/sys/conf/files,v 1.227 2008/07/26 14:26:30 sephe Exp $
+# $DragonFly: src/sys/conf/files,v 1.228 2008/07/28 01:21:39 swildner Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -50,11 +50,9 @@ bus/cam/scsi/scsi_pt.c			optional pt
 bus/cam/scsi/scsi_sa.c			optional sa
 bus/cam/scsi/scsi_cd.c			optional cd
 bus/cam/scsi/scsi_ch.c			optional ch
-bus/cam/scsi/scsi_low.c			optional ct
 bus/cam/scsi/scsi_low.c			optional ncv
 bus/cam/scsi/scsi_low.c			optional nsp
 bus/cam/scsi/scsi_low.c			optional stg
-bus/cam/scsi/scsi_low_pisa.c		optional ct
 bus/cam/scsi/scsi_low_pisa.c		optional ncv
 bus/cam/scsi/scsi_low_pisa.c		optional nsp
 bus/cam/scsi/scsi_low_pisa.c		optional stg
diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files
index 33dcab2496..c3ebc6498f 100644
--- a/sys/platform/pc32/conf/files
+++ b/sys/platform/pc32/conf/files
@@ -2,7 +2,7 @@
 # files marked standard are always included.
 #
 # $FreeBSD: src/sys/conf/files.i386,v 1.307.2.38 2003/01/02 20:41:33 kan Exp $
-# $DragonFly: src/sys/platform/pc32/conf/files,v 1.17 2008/07/26 07:15:11 sephe Exp $
+# $DragonFly: src/sys/platform/pc32/conf/files,v 1.18 2008/07/28 01:21:39 swildner Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -102,7 +102,6 @@ dev/misc/kbd/kbd.c			optional	atkbd
 dev/misc/kbd/kbd.c			optional	kbd
 dev/misc/kbd/kbd.c			optional	sc
 dev/misc/kbd/kbd.c			optional	ukbd
-dev/misc/kbd/kbd.c			optional	vt
 dev/raid/pst/pst-pci.c			optional	pst pci
 dev/raid/pst/pst-iop.c			optional	pst
 dev/raid/pst/pst-raid.c			optional	pst
-- 
2.41.0