diff options
| author | peter <peter@FreeBSD.org> | 1999-04-13 19:38:12 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-04-13 19:38:12 +0000 |
| commit | 7d0299e0a54d7a75324ab8c53af872c54a8cb175 (patch) | |
| tree | 721a4a6c49e2837082092fa69e5e8d565b19106a /sys/amd64 | |
| parent | dfdcc6233207986cb1e4fdc12bd940925c5f19c6 (diff) | |
| download | FreeBSD-src-7d0299e0a54d7a75324ab8c53af872c54a8cb175.zip FreeBSD-src-7d0299e0a54d7a75324ab8c53af872c54a8cb175.tar.gz | |
Shoot the LKM support in the old wd/wdc/atapi driver set in the head and
perform a cleanup/unifdef sweep over it to tidy things up. The atapi
code is permanently attached to the wd driver and is always probed.
I will add an extra option bit in the flags to disable an atapi probe on
either the master or slave if needed, if people want this.
Remember, this driver is destined to die some time. It's possible that
it will loose all atapi support down the track and only be used for
dumb non-ATA disks and all ata/atapi devices will be handled by the new
ata system.
ATAPI, ATAPI_STATIC and CMD640 are no longer options, all are implicit.
Previously discussed with: sos
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 7ea722f..1d3e4f5 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: GENERIC,v 1.156 1999/03/29 17:56:27 ken Exp $ +# $Id: GENERIC,v 1.157 1999/04/11 20:53:50 n_hibma Exp $ machine "i386" cpu "I386_CPU" @@ -60,7 +60,6 @@ controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2 disk fd0 at fdc0 drive 0 disk fd1 at fdc0 drive 1 -options "CMD640" # work around CMD640 chip deficiency controller wdc0 at isa? port "IO_WD1" bio irq 14 disk wd0 at wdc0 drive 0 disk wd1 at wdc0 drive 1 @@ -69,8 +68,6 @@ controller wdc1 at isa? port "IO_WD2" bio irq 15 disk wd2 at wdc1 drive 0 disk wd3 at wdc1 drive 1 -options ATAPI #Enable ATAPI support for IDE bus -options ATAPI_STATIC #Don't do it as an LKM device wcd0 #IDE CD-ROM device wfd0 #IDE Floppy (e.g. LS-120) |
