Pre 3.0 branch cleanup casualty #5: nca, sea, wds, uha

No CAM drivers available.  If somebody CAMifies one of these, they
will be welcome back in the tree

2 files changed, 4 insertions, 20 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index f7b566b..02cca8b 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.514 1998/12/27 12:44:54 phk Exp $
+#	$Id: LINT,v 1.515 1998/12/27 12:52:45 phk Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -886,7 +886,7 @@ device		npx0	at isa? port IO_NPX iosiz 0x0 flags 0x0 irq 13
 #
 
 #
-# SCSI host adapters: `aha', `aic', `bt', `nca'
+# SCSI host adapters: `aha', `aic', `bt'
 #
 # adv: All Narrow SCSI bus AdvanSys controllers.
 # adw: Second Generation AdvanSys controllers including the ADV940UW.
@@ -894,10 +894,6 @@ device		npx0	at isa? port IO_NPX iosiz 0x0 flags 0x0 irq 13
 # ahc: Adaptec 274x/284x/294x
 # aic: Adaptec 152x and sound cards using the Adaptec AIC-6360 (slow!)
 # bt: Most Buslogic controllers
-# nca: ProAudioSpectrum cards using the NCR 5380 or Trantor T130
-# uha: UltraStor ULTRA 14F/24F/34F
-# sea: Seagate ST01/02 8 bit controller (slow!)
-# wds: Western Digital WD7000 controller (no scatter/gather!).
 #
 # Note that the order is important in order for Buslogic cards to be
 # probed correctly.
@@ -907,17 +903,9 @@ controller	bt0	at isa? port "IO_BT0" cam irq ?
 controller	adv0	at isa? port ? cam irq ?
 controller	adw0
 controller      aha0    at isa? port ? cam irq ?
-#!CAM# controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5
 
 #!CAM# controller      aic0    at isa? port 0x340 bio irq 11
-#!CAM# controller	nca0	at isa? port 0x1f88 bio irq 10
-#!CAM# controller	nca1	at isa? port 0x1f84
-#!CAM# controller	nca2	at isa? port 0x1f8c
-#!CAM# controller	nca3	at isa? port 0x1e88
-#!CAM# controller	nca4	at isa? port 0x350 bio irq 5
-
-#!CAM# controller	sea0	at isa? bio irq 5 iomem 0xdc000 iosiz 0x2000
-#!CAM# controller	wds0	at isa? port 0x350 bio irq 15 drq 6
+
 
 #
 # ST-506, ESDI, and IDE hard disks: `wdc' and `wd'
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 40ede78..249a285 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-#	$Id: files.i386,v 1.209 1998/12/27 12:44:55 phk Exp $
+#	$Id: files.i386,v 1.210 1998/12/27 12:52:46 phk Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -142,7 +142,6 @@ i386/isa/lpt.c			optional	lpt	device-driver
 i386/isa/labpc.c		optional	labpc	device-driver
 i386/isa/mcd.c			optional	mcd	device-driver
 i386/isa/mse.c			optional	mse	device-driver
-#i386/isa/ncr5380.c		optional	nca	device-driver
 i386/isa/npx.c			mandatory	npx	device-driver
 i386/isa/pcaudio.c		optional	pca	device-driver
 i386/isa/matcd/matcd.c		optional	matcd	device-driver
@@ -158,7 +157,6 @@ i386/isa/random_machdep.c	standard
 i386/isa/rc.c			optional	rc	device-driver
 i386/isa/rp.c			optional	rp	device-driver
 i386/isa/scd.c			optional	scd	device-driver
-#i386/isa/seagate.c		optional	sea	device-driver
 i386/isa/si.c			optional	si	device-driver
 i386/isa/si2_z280.c		optional	si	device-driver
 i386/isa/si3_t225.c		optional	si	device-driver
@@ -238,7 +236,6 @@ i386/isa/scvesactl.c		optional	sc	device-driver
 i386/isa/videoio.c		optional	sc	device-driver
 i386/isa/vesa.c			optional	sc	device-driver
 i386/isa/tw.c			optional	tw	device-driver
-#i386/isa/ultra14f.c		optional	uha	device-driver
 i386/isa/wd.c			optional	wdc	device-driver
 i386/isa/wd.c			optional	wd	device-driver
 i386/isa/atapi.c		optional	atapi	device-driver
@@ -246,7 +243,6 @@ i386/isa/atapi-cd.c		optional	acd	device-driver
 i386/isa/wcd.c			optional	wcd	device-driver
 i386/isa/wfd.c			optional	wfd	device-driver
 i386/isa/wst.c			optional	wst	device-driver
-i386/isa/wd7000.c		optional	wds	device-driver
 i386/isa/wt.c			optional	wt	device-driver
 i386/linux/imgact_linux.c	optional	compat_linux
 i386/linux/linux_dummy.c	optional	compat_linux