From: niklas <niklas@openbsd.org>
Date: Thu, 2 May 1996 07:21:15 +0000 (+0000)
Subject: The ed driver cannot be in conf/files due to a name conflict in the amiga
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e13dcf839b424ee92a2b62cfd98be0c1f95932c0;p=openbsd

The ed driver cannot be in conf/files due to a name conflict in the amiga
port.  This is resolved like the if_le conflict, by having it in files.i386
until the conflict is resolved.
---

diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 2bd8ee7cb59..736f540f622 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.14 1996/04/29 14:12:16 hvozda Exp $
+#	$OpenBSD: files.i386,v 1.15 1996/05/02 07:21:15 niklas Exp $
 #	$NetBSD: files.i386,v 1.72 1996/04/09 22:59:03 cgd Exp $
 #
 # new style config file for i386 architecture
@@ -141,9 +141,10 @@ file	arch/i386/isa/spkr.c		spkr needs-flag
 # 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: ether, ifnet
-#attach	ed at isa
-#file	dev/isa/if_ed.c			ed
+device	ed: ether, ifnet
+attach	ed at isa with ed_isa
+attach	ed at pcmcia with ed_pcmcia
+file	dev/isa/if_ed.c			ed & (ed_isa | ed_pcmcia) needs-flag
 
 # AMD am7990 (Lance) -based boards
 # (BICC Isolan, NE2100, DEPCA)