diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-05-02 07:21:16 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-05-02 07:21:16 +0000 |
| commit | 4a5ad862390efead1847a41f6774d0041d7a02c7 (patch) | |
| tree | f979bf6a8a576677d8b672dc0fc54705361d79bb /sys/arch/i386 | |
| parent | a1ab0133973a053ec8cb7034b5f525c772d2c6d6 (diff) | |
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.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/files.i386 | 9 |
1 files changed, 5 insertions, 4 deletions
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) |