From c504131efedb09a55716342b86824a7a820893af Mon Sep 17 00:00:00 2001 From: niklas Date: Thu, 2 May 1996 07:43:07 +0000 Subject: [PATCH] Oops! A file forgotten from the former commit: 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. --- sys/dev/isa/files.isa | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa index 6303824ce85..63341eb0196 100644 --- a/sys/dev/isa/files.isa +++ b/sys/dev/isa/files.isa @@ -1,4 +1,4 @@ -# $OpenBSD: files.isa,v 1.11 1996/04/29 14:16:22 hvozda Exp $ +# $OpenBSD: files.isa,v 1.12 1996/05/02 07:43:07 niklas Exp $ # $NetBSD: files.isa,v 1.17 1996/03/29 20:53:30 mycroft Exp $ # # Config.new file and device description for machine-independent ISA code. @@ -147,10 +147,10 @@ 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) # XXX conflicts with amiga if_ed.c -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 +#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 # 3Com 3C505 device eg: ether, ifnet -- 2.20.1