From 3aad36b25b7e0e415e47ef2fa4e0e55c0ff25e2c Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 10 Apr 2019 15:01:15 +0000
Subject: [PATCH] qla2x00t-32gbit/Kconfig: Sync with kernel v5.1-rc1

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8180 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/Kconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qla2x00t-32gbit/Kconfig b/qla2x00t-32gbit/Kconfig
index 285e25b8b..09f9cc0d6 100644
--- a/qla2x00t-32gbit/Kconfig
+++ b/qla2x00t-32gbit/Kconfig
@@ -1,8 +1,10 @@
 config SCSI_QLA_FC
 	tristate "QLogic QLA2XXX Fibre Channel Support"
 	depends on PCI && SCSI
-	select SCSI_FC_ATTRS
+	depends on SCSI_FC_ATTRS
+	depends on NVME_FC || !NVME_FC
 	select FW_LOADER
+	select BTREE
 	---help---
 	This qla2xxx driver supports all QLogic Fibre Channel
 	PCI and PCIe host adapters.
@@ -26,6 +28,8 @@ config SCSI_QLA_FC
 
 		http://ldriver.qlogic.com/firmware/
 
+	They are also included in the linux-firmware tree as well.
+
 config SCSI_QLA2XXX_TARGET
 	bool "QLogic 2xxx target mode support"
 	depends on SCSI_QLA_FC