summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/i386/conf/files.i3867
-rw-r--r--sys/dev/isa/files.isa6
2 files changed, 11 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 3b0296e2646..105bca78f7b 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,3 +1,4 @@
+# $OpenBSD: files.i386,v 1.7 1996/02/27 11:13:00 niklas Exp $
# $NetBSD: files.i386,v 1.61 1996/01/08 13:51:30 mycroft Exp $
#
# new style config file for i386 architecture
@@ -114,6 +115,12 @@ file arch/i386/isa/spkr.c spkr needs-flag
device le at isa, pci: ether, ifnet, isadma
file dev/isa/if_le.c le
+# National Semiconductor DS8390/WD83C690-based boards
+# (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones)
+# XXX conflicts with other ports; can't be in files.isa
+device ed at isa, pcmciabus: ether, ifnet
+file dev/isa/if_ed.c ed needs-flag
+
# Game adapter (joystick)
device joy at isa
file arch/i386/isa/joy.c joy needs-flag
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 29ac9ea2ee6..dbc500353e0 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,3 +1,4 @@
+# $OpenBSD: files.isa,v 1.6 1996/02/27 11:12:56 niklas Exp $
# $NetBSD: files.isa,v 1.10 1996/01/13 02:05:15 thorpej Exp $
#
# Config.new file and device description for machine-independent ISA code.
@@ -126,8 +127,9 @@ file dev/isa/elink.c elink
# National Semiconductor DS8390/WD83C690-based boards
# (WD/SMC 80x3 family, SMC Ultra [8216], 3Com 3C503, NE[12]000, and clones)
-device ed at isa, pcmciabus: ether, ifnet
-file dev/isa/if_ed.c ed needs-flag
+# XXX conflicts with amiga if_ed.c
+#device ed at isa, pcmciabus: ether, ifnet
+#file dev/isa/if_ed.c ed needs-flag
# 3Com 3C505
device eg at isa: ether, ifnet