diff options
author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-27 18:39:08 +0000 |
---|---|---|
committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-27 18:39:08 +0000 |
commit | 61aa6f7b30e536382606a49e9a65374b125db338 (patch) | |
tree | be587186b2f38f6fce1900c5bb71acadd3120a8f /sys/dev/isa/files.isa | |
parent | 8d6a67b28c750bb5eb69cca28d6e787b1f57336f (diff) |
Bring forward the Amiga ISA support, and resolve a conflict with if_ed
Diffstat (limited to 'sys/dev/isa/files.isa')
-rw-r--r-- | sys/dev/isa/files.isa | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa index 97649d04f7f..f145e7b4d30 100644 --- a/sys/dev/isa/files.isa +++ b/sys/dev/isa/files.isa @@ -1,4 +1,4 @@ -# $OpenBSD: files.isa,v 1.9 1996/04/24 16:52:42 mickey Exp $ +# $OpenBSD: files.isa,v 1.10 1996/04/27 18:39: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. @@ -167,9 +167,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) # XXX conflicts with amiga if_ed.c -device ed: ether, ifnet -attach ed at isa -file dev/isa/if_ed.c ed needs-flag +#device ed: ether, ifnet +#attach ed at isa +#file dev/isa/if_ed.c ed needs-flag # 3Com 3C505 device eg: ether, ifnet |