summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>1999-07-22 00:27:58 +0000
committerderaadt <deraadt@openbsd.org>1999-07-22 00:27:58 +0000
commit0b782f3a0ca865b8a4b68c11727f8c24a547674d (patch)
tree042daacff80ef82259d9587ef97f229c1a0ba4ef /sys
parentremove unneeded entries (diff)
downloadwireguard-openbsd-0b782f3a0ca865b8a4b68c11727f8c24a547674d.tar.xz
wireguard-openbsd-0b782f3a0ca865b8a4b68c11727f8c24a547674d.zip
pnpdevs.h
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/isa/files.isa20
-rw-r--r--sys/dev/isa/pnpdevs.h3
2 files changed, 11 insertions, 12 deletions
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 309e7f05ab3..8c44cec070a 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.isa,v 1.56 1999/07/20 16:36:05 deraadt Exp $
+# $OpenBSD: files.isa,v 1.57 1999/07/22 00:27:58 deraadt 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.
@@ -119,18 +119,18 @@ 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
+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
+#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
# Wangtek- and Archive-compatible tape controller boards
diff --git a/sys/dev/isa/pnpdevs.h b/sys/dev/isa/pnpdevs.h
index 9a5b4ec46cd..92e123df482 100644
--- a/sys/dev/isa/pnpdevs.h
+++ b/sys/dev/isa/pnpdevs.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * # OpenBSD: pnpdevs,v 1.84 1999/07/22 00:18:22 todd Exp
+ * # OpenBSD: pnpdevs,v 1.85 1999/07/22 00:27:55 deraadt Exp
*/
struct isapnp_knowndev isapnp_knowndevs[] = {
@@ -117,7 +117,6 @@ struct isapnp_knowndev isapnp_knowndevs[] = {
{ "CSC0001", "joy" },
{ "CSC000F", "joy" },
{ "CSC0101", "joy" },
- { "CTL7001", "joy" },
{ "CTL7002", "joy" },
{ "ESS0001", "joy" },
{ "ESS0005", "joy" },