diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 1999-09-09 21:27:37 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 1999-09-09 21:27:37 +0000 |
| commit | 9fab2f3a3c401efa3519cff02b6c7041340bf4fb (patch) | |
| tree | 7e74be264ba011755675d0eb7cbb79b27be1330f /sys | |
| parent | 984c8ae4333632f32f8b1eaa9b842e6188e4e5b2 (diff) | |
New atapi->scsi interface.
Kill acd.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amiga/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/amiga/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/amiga/conf/files.amiga | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC index 2e6ad316b77..e27b8eecdd6 100644 --- a/sys/arch/amiga/conf/GENERIC +++ b/sys/arch/amiga/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.26 1999/01/20 17:57:07 niklas Exp $ +# $OpenBSD: GENERIC,v 1.27 1999/09/09 21:27:36 espie Exp $ # $NetBSD: GENERIC,v 1.85 1997/08/27 19:32:49 is Exp $ # @@ -255,9 +255,6 @@ wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers #wdc1 at isa? port 0x170 irq ? wd* at wdc? drive ? -atapibus* at wdc? -acd* at atapibus? drive ? - 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 diff --git a/sys/arch/amiga/conf/RAMDISK b/sys/arch/amiga/conf/RAMDISK index 371241ab35b..eff8f6760aa 100644 --- a/sys/arch/amiga/conf/RAMDISK +++ b/sys/arch/amiga/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.5 1998/10/04 23:26:38 niklas Exp $ +# $OpenBSD: RAMDISK,v 1.6 1999/09/09 21:27:36 espie Exp $ # # A ramdisk kernel @@ -226,9 +226,6 @@ wdc0 at isa? port 0x1f0 irq 14 # ST506, ESDI, and IDE controllers #wdc1 at isa? port 0x170 irq ? wd* at wdc? drive ? -atapibus* at wdc? -acd* at atapibus? drive ? - 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 diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga index 6378e4f3928..50af3683c7a 100644 --- a/sys/arch/amiga/conf/files.amiga +++ b/sys/arch/amiga/conf/files.amiga @@ -1,4 +1,4 @@ -# $OpenBSD: files.amiga,v 1.31 1999/01/20 17:57:07 niklas Exp $ +# $OpenBSD: files.amiga,v 1.32 1999/09/09 21:27:36 espie Exp $ # $NetBSD: files.amiga,v 1.62 1997/08/27 19:32:47 is Exp $ @@ -308,7 +308,8 @@ file arch/amiga/dev/drbbc.c drbbc # # Machine-independent ATAPI drivers # -include "../../../dev/atapi/files.atapi" +include "../../../dev/atapiscsi/files.atapiscsi" +include "../../../dev/ata/files.ata" # # ISA devices @@ -369,7 +370,6 @@ major {st = 5} major {vnd = 6} major {cd = 7} major {ccd = 8} -major {acd = 15} major {rd = 16} # Compatibility modules |