Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4bf55b5..3c52867 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1253,20 +1253,6 @@ config SCSI_LPFC_DEBUG_FS
          This makes debugging information from the lpfc driver
          available via the debugfs filesystem.
 
-config LPFC_NVME_INITIATOR
-       bool "Emulex LightPulse Fibre Channel NVME Initiator Support"
-       depends on SCSI_LPFC && NVME_FC
-       ---help---
-         This enables NVME Initiator support in the Emulex lpfc driver.
-
-config LPFC_NVME_TARGET
-       bool "Emulex LightPulse Fibre Channel NVME Initiator Support"
-       depends on SCSI_LPFC && NVME_TARGET_FC
-       ---help---
-         This enables NVME Target support in the Emulex lpfc driver.
-         Target enablement must still be enabled on a per adapter
-         basis by module parameters.
-
 config SCSI_SIM710
        tristate "Simple 53c710 SCSI support (Compaq, NCR machines)"
        depends on (EISA || MCA) && SCSI