Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752464AbWAFQeU (ORCPT ); Fri, 6 Jan 2006 11:34:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752466AbWAFQeT (ORCPT ); Fri, 6 Jan 2006 11:34:19 -0500 Received: from mailout.stusta.mhn.de ([141.84.69.5]:57099 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S1752458AbWAFQeH (ORCPT ); Fri, 6 Jan 2006 11:34:07 -0500 Date: Fri, 6 Jan 2006 17:34:01 +0100 From: Adrian Bunk To: andrew.vasquez@qlogic.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [2.6 patch] drivers/scsi/qla2xxx/Kconfig: two fixes Message-ID: <20060106163401.GP12131@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2765 Lines: 75 This patch contains the following fixes for drivers/scsi/qla2xxx/Kconfig: - add a help text for SCSI_QLA2XXX_EMBEDDED_FIRMWARE - the firmware modules must depend on SCSI_QLA2XXX to prevent illegal configurations like SCSI_QLA2XXX=m, SCSI_QLA21XX=y Signed-off-by: Adrian Bunk --- drivers/scsi/qla2xxx/Kconfig | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) --- linux-2.6.15-mm1-full/drivers/scsi/qla2xxx/Kconfig.old 2006-01-06 16:38:09.000000000 +0100 +++ linux-2.6.15-mm1-full/drivers/scsi/qla2xxx/Kconfig 2006-01-06 16:39:51.000000000 +0100 @@ -29,42 +29,46 @@ config SCSI_QLA2XXX_EMBEDDED_FIRMWARE bool " Use firmware-loader modules (DEPRECATED)" depends on SCSI_QLA2XXX + 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_QLA2XXX && 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_QLA2XXX && 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_QLA2XXX && 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_QLA2XXX && 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_QLA2XXX && 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_QLA2XXX && SCSI_QLA2XXX_EMBEDDED_FIRMWARE ---help--- This driver supports the QLogic 24xx (ISP2422 and ISP2432) host adapter family. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/