diff options
| author | green <green@FreeBSD.org> | 1999-12-19 06:22:11 +0000 |
|---|---|---|
| committer | green <green@FreeBSD.org> | 1999-12-19 06:22:11 +0000 |
| commit | c3ff65ba4ef0cda2fa7ad7f1ef79f1f5d1ab1f10 (patch) | |
| tree | eaacefd03ddc618438fc319408812093be49c6d2 /sys/i386 | |
| parent | 4b6baecfc724bac12be9de99924e828b1e68046e (diff) | |
| download | FreeBSD-src-c3ff65ba4ef0cda2fa7ad7f1ef79f1f5d1ab1f10.zip FreeBSD-src-c3ff65ba4ef0cda2fa7ad7f1ef79f1f5d1ab1f10.tar.gz | |
Allow LINT to build again.
The wd(4) family had to be disabled; wd(4) and ata(4) are mutually
exclusive, even at link level.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/LINT | 18 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 18 |
2 files changed, 20 insertions, 16 deletions
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index e90fbfa..73c2b83 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -1152,13 +1152,15 @@ options ATA_ENABLE_ATAPI_DMA # on a MB that already has a PIIX controller. Note the bogus irq and port # entries. These are automatically filled in by the IDE/PCI support. # - -controller wdc0 at isa? port IO_WD1 irq 14 -device wd0 at wdc0 drive 0 -device wd1 at wdc0 drive 1 -controller wdc1 at isa? port IO_WD2 irq 15 -device wd2 at wdc1 drive 0 -device wd3 at wdc1 drive 1 +# This driver must be commented out because it is mutually exclusive with +# the ata(4) driver. +# +#controller wdc0 at isa? port IO_WD1 irq 14 +#device wd0 at wdc0 drive 0 +#device wd1 at wdc0 drive 1 +#controller wdc1 at isa? port IO_WD2 irq 15 +#device wd2 at wdc1 drive 0 +#device wd3 at wdc1 drive 1 # # This option allow you to override the default probe time for IDE @@ -1166,7 +1168,7 @@ device wd3 at wdc1 drive 1 # the IDE specs, but may still work for you (it will work for most # people). # -options IDE_DELAY=8000 # Be optimistic about Joe IDE device +#options IDE_DELAY=8000 # Be optimistic about Joe IDE device # IDE CD-ROM & CD-R/RW driver - requires wdc controller #device wcd0 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index e90fbfa..73c2b83 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1152,13 +1152,15 @@ options ATA_ENABLE_ATAPI_DMA # on a MB that already has a PIIX controller. Note the bogus irq and port # entries. These are automatically filled in by the IDE/PCI support. # - -controller wdc0 at isa? port IO_WD1 irq 14 -device wd0 at wdc0 drive 0 -device wd1 at wdc0 drive 1 -controller wdc1 at isa? port IO_WD2 irq 15 -device wd2 at wdc1 drive 0 -device wd3 at wdc1 drive 1 +# This driver must be commented out because it is mutually exclusive with +# the ata(4) driver. +# +#controller wdc0 at isa? port IO_WD1 irq 14 +#device wd0 at wdc0 drive 0 +#device wd1 at wdc0 drive 1 +#controller wdc1 at isa? port IO_WD2 irq 15 +#device wd2 at wdc1 drive 0 +#device wd3 at wdc1 drive 1 # # This option allow you to override the default probe time for IDE @@ -1166,7 +1168,7 @@ device wd3 at wdc1 drive 1 # the IDE specs, but may still work for you (it will work for most # people). # -options IDE_DELAY=8000 # Be optimistic about Joe IDE device +#options IDE_DELAY=8000 # Be optimistic about Joe IDE device # IDE CD-ROM & CD-R/RW driver - requires wdc controller #device wcd0 |
