[SCSI] qla2xxx: Kconfig: two fixes

Original From: Adrian Bunk

Here's a composite patch with Adrian's original additions and
help-text with the new Kconfig variable SCSI_QLA_FC.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 12 insertions, 8 deletions

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 5205c4e7d6ff..02cc79474e8c 100644
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -1,4 +1,4 @@
-config SCSI_QLA2XXX
+config SCSI_QLA_FC
         tristate "QLogic QLA2XXX Fibre Channel Support"
         depends on PCI && SCSI
         select SCSI_FC_ATTRS
@@ -28,43 +28,47 @@ config SCSI_QLA2XXX
 
 config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         bool "  Use firmware-loader modules (DEPRECATED)"
-        depends on SCSI_QLA2XXX
+        depends on SCSI_QLA_FC
+        help
+          This option offers you the deprecated firmware-loader
+          modules that have been obsoleted by the usage of the
+          Firmware Loader interface in the qla2xxx driver.
 
 config SCSI_QLA21XX
         tristate "  Build QLogic ISP2100 firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 21xx (ISP2100) host adapter family.
 
 config SCSI_QLA22XX
         tristate "  Build QLogic ISP2200 firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 22xx (ISP2200) host adapter family.
 
 config SCSI_QLA2300
         tristate "  Build QLogic ISP2300 firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
         adapter family.
 
 config SCSI_QLA2322
         tristate "  Build QLogic ISP2322 firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 2322 (ISP2322) host adapter family.
 
 config SCSI_QLA6312
         tristate "  Build QLogic ISP63xx firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
         adapter family.
 
 config SCSI_QLA24XX
         tristate "  Build QLogic ISP24xx firmware-module"
-        depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+        depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
         ---help---
         This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
         adapter family.