Enable new ATA/ATAPISCSI functionality as default.

1 files changed, 4 insertions, 16 deletions

diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index ee401d51616..fbfc64b29e7 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.58 1999/07/22 00:35:15 deraadt Exp $
+#	$OpenBSD: files.isa,v 1.59 1999/07/25 04:38:26 csapuntz Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config file and device description for machine-independent ISA code.
@@ -117,21 +117,9 @@ device	pcd: disk, opti
 attach	pcd at isa
 file	dev/isa/pcd.c			pcd needs-flag
 
-#Start uncommenting for new ATA stuff
-## ISA "wd" (ESDI/IDE/etc.) controllers, ATAPI bus
-#attach wdc at isa with wdc_isa: isa_dma
-#file   dev/isa/wdc_isa.c                wdc_isa
-#end uncommenting for new ATA stuff
-
-#Start comment this out for new ATA stuff
-define       ata {drive = -1}
-device       wdc {drive = -1}: atapi, ata
-attach       wdc at isa with wdc_isa
-device       wd: disk
-attach       wd at wdc
-file dev/isa/wdc.c                   wdc & (wdc_isa | wdc_isapnp) needs-flag
-file dev/isa/wd.c                    wd needs-flag
-#End comment this out for new ATA stuff
+# ISA "wd" (ESDI/IDE/etc.) controllers, ATAPI bus
+attach wdc at isa with wdc_isa: isa_dma
+file   dev/isa/wdc_isa.c                wdc_isa
 
 # Wangtek- and Archive-compatible tape controller boards
 device	wt: tape, isa_dma