summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/Kconfig
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2016-01-13 16:29:30 -0800
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2016-01-13 16:29:30 -0800
commit60539fa3a1e3caf458a943b1a14154e3fa44d0d1 (patch)
tree9bca5f667844338ed877cb8b1684c9f661a003c3 /drivers/scsi/Kconfig
parentabaee091a18c19ccd86feb1c8374585d82e96777 (diff)
parenta290dd57926cb0c54eec7ea506885119e296b755 (diff)
downloadlinux-60539fa3a1e3caf458a943b1a14154e3fa44d0d1.tar.gz
linux-60539fa3a1e3caf458a943b1a14154e3fa44d0d1.tar.bz2
linux-60539fa3a1e3caf458a943b1a14154e3fa44d0d1.zip
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-queue' into misc
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r--drivers/scsi/Kconfig17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index c1fe0d2f90ca..23d862dfdde3 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1620,23 +1620,6 @@ config ATARI_SCSI
ST-DMA, replacing ACSI). It does NOT support other schemes, like
in the Hades (without DMA).
-config ATARI_SCSI_TOSHIBA_DELAY
- bool "Long delays for Toshiba CD-ROMs"
- depends on ATARI_SCSI
- help
- This option increases the delay after a SCSI arbitration to
- accommodate some flaky Toshiba CD-ROM drives. Say Y if you intend to
- use a Toshiba CD-ROM drive; otherwise, the option is not needed and
- would impact performance a bit, so say N.
-
-config ATARI_SCSI_RESET_BOOT
- bool "Reset SCSI-devices at boottime"
- depends on ATARI_SCSI
- help
- Reset the devices on your Atari whenever it boots. This makes the
- boot process fractionally longer but may assist recovery from errors
- that leave the devices with SCSI operations partway completed.
-
config MAC_SCSI
tristate "Macintosh NCR5380 SCSI"
depends on MAC && SCSI=y