diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-10-04 23:26:39 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-10-04 23:26:39 +0000 |
| commit | 691f6889d5a80e81adc69c2b51694b2ee133ea3c (patch) | |
| tree | f61c752134d90f1813109cb3bbbcb0ada73300eb /sys | |
| parent | ccb7bd8780bea3db8367d47d81336bdb5be46f92 (diff) | |
No more name clashes since ed disappeared from the isa world
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amiga/conf/GENERIC | 12 | ||||
| -rw-r--r-- | sys/arch/amiga/conf/RAMDISK | 12 | ||||
| -rw-r--r-- | sys/arch/amiga/conf/files.amiga | 8 |
3 files changed, 15 insertions, 17 deletions
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC index 95d0fbabfc2..02cca68d0f1 100644 --- a/sys/arch/amiga/conf/GENERIC +++ b/sys/arch/amiga/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.24 1998/04/26 22:30:59 niklas Exp $ +# $OpenBSD: GENERIC,v 1.25 1998/10/04 23:26:38 niklas Exp $ # $NetBSD: GENERIC,v 1.85 1997/08/27 19:32:49 is Exp $ # @@ -244,10 +244,12 @@ wd* at wdc? drive ? atapibus* at wdc? acd* at atapibus? drive ? -# XXX should be ed but clashes with Zorro ed device -isaed0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC, 3C503, and NE[12]000 -isaed1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards -isaed2 at isa? port 0x300 iomem 0xcc000 irq 10 +we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series +we1 at isa? port 0x300 iomem 0xcc000 irq 10 # +ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards +ne0 at isa? port 0x240 iomem 0xd8000 irq 9 # NE[12]000 ethernet cards +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards +#ne* at isapnp? # NE[12]000 PnP ethernet cards fd* at fdc0 unit ? diff --git a/sys/arch/amiga/conf/RAMDISK b/sys/arch/amiga/conf/RAMDISK index be89c74acfe..371241ab35b 100644 --- a/sys/arch/amiga/conf/RAMDISK +++ b/sys/arch/amiga/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.4 1997/09/19 17:16:17 niklas Exp $ +# $OpenBSD: RAMDISK,v 1.5 1998/10/04 23:26:38 niklas Exp $ # # A ramdisk kernel @@ -229,10 +229,12 @@ wd* at wdc? drive ? atapibus* at wdc? acd* at atapibus? drive ? -# XXX should be ed but clashes with Zorro ed device -isaed0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC, 3C503, and NE[12]000 -isaed1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards -isaed2 at isa? port 0x300 iomem 0xcc000 irq 10 +we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC 80x3 ethernet series +we1 at isa? port 0x300 iomem 0xcc000 irq 10 # +ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3C503 ethernet cards +ne0 at isa? port 0x240 iomem 0xd8000 irq 9 # NE[12]000 ethernet cards +ne1 at isa? port 0x300 irq 10 # NE[12]000 ethernet cards +#ne* at isapnp? # NE[12]000 PnP ethernet cards fd* at fdc0 unit ? diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga index 9ba612d74d0..b6ec53bc341 100644 --- a/sys/arch/amiga/conf/files.amiga +++ b/sys/arch/amiga/conf/files.amiga @@ -1,4 +1,4 @@ -# $OpenBSD: files.amiga,v 1.28 1998/04/26 22:31:01 niklas Exp $ +# $OpenBSD: files.amiga,v 1.29 1998/10/04 23:26:38 niklas Exp $ # $NetBSD: files.amiga,v 1.62 1997/08/27 19:32:47 is Exp $ @@ -333,12 +333,6 @@ include "../../../dev/isa/files.isa" file arch/amiga/isa/isadma.c isadma needs-flag -# XXX should really use if_ed instead, but can't for the moment due to -# name clashes with the amiga variant. -device isaed: ifnet, ether -attach isaed at isa with isaed_isa -file arch/amiga/isa/if_isaed.c isaed & isaed_isa needs-flag - # ISA PnP include "../../../dev/isa/files.isapnp" file arch/amiga/isa/isapnp_machdep.c isapnp |