[SCSI] qla2xxx: Remove obsolete firmware-loader-module support.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index ff40906c66f9e3c9ed96a55c828d09181a359805..8c865b9e02b579f2d5bfc64a706fec3ea4063433 100644 (file)
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -24,48 +24,3 @@ config SCSI_QLA_FC
        Firmware images can be retrieved from:
 
                ftp://ftp.qlogic.com/outgoing/linux/firmware/
-
-       NOTE: The original method of building firmware-loader
-       modules has been deprecated as the firmware-images will
-       be removed from the kernel sources.
-
-config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-       bool "  Use firmware-loader modules (DEPRECATED)"
-       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_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_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-       ---help---
-       This driver supports the QLogic 22xx (ISP2200) host adapter family.
-
-config SCSI_QLA2300
-       tristate "  Build QLogic ISP2300/ISP6312 firmware-module"
-       depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-       ---help---
-       This driver supports the QLogic 2300 (ISP2300, ISP2312 and
-       ISP6312) host adapter family.
-
-config SCSI_QLA2322
-       tristate "  Build QLogic ISP2322/ISP6322 firmware-module"
-       depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-       ---help---
-       This driver supports the QLogic 2322 (ISP2322 and ISP6322) host
-       adapter family.
-
-config SCSI_QLA24XX
-       tristate "  Build QLogic ISP24xx firmware-module"
-       depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
-       ---help---
-       This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
-       adapter family.

diff --cc drivers/scsi/qla2xxx/Makefile
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2100.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2100_fw.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2200.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2200_fw.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2300.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2300_fw.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2322.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2322_fw.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2400.c
Simple merge

diff --cc drivers/scsi/qla2xxx/ql2400_fw.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_def.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_fw.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_gbl.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_init.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge