Merge remote-tracking branch 'mkp-scsi/4.5/scsi-queue' into misc (60539fa3) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/scsi/3w-xxxx.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1045,6 +1045,9 @@ static int tw_chrdev_open(struct inode inode, struct file file)
		static const struct file_operations tw_fops = {
		.owner = THIS_MODULE,
		.unlocked_ioctl = tw_chrdev_ioctl,
		#ifdef CONFIG_COMPAT
		.compat_ioctl = tw_chrdev_ioctl,
		#endif
		.open = tw_chrdev_open,
		.release = NULL,
		.llseek = noop_llseek,

+0 −17

Original line number	Diff line number	Diff line
		@@ -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