Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index d4023bf..230043c 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1235,11 +1235,13 @@ config SCSI_QLOGICPTI
 source "drivers/scsi/qla2xxx/Kconfig"
 source "drivers/scsi/qla4xxx/Kconfig"
 source "drivers/scsi/qedi/Kconfig"
+source "drivers/scsi/qedf/Kconfig"
 
 config SCSI_LPFC
        tristate "Emulex LightPulse Fibre Channel Support"
        depends on PCI && SCSI
        depends on SCSI_FC_ATTRS
+       depends on NVME_FC && NVME_TARGET_FC
        select CRC_T10DIF
        help
           This lpfc driver supports the Emulex LightPulse
@@ -1478,7 +1480,7 @@ config ATARI_SCSI
 
 config MAC_SCSI
        tristate "Macintosh NCR5380 SCSI"
-       depends on MAC && SCSI=y
+       depends on MAC && SCSI
        select SCSI_SPI_ATTRS
        help
          This is the NCR 5380 SCSI controller included on most of the 68030