[2.6 patch] SCSI_QLOGIC_1280_1040 dependencies

[Adrian Bunk]

On Sat, Oct 23, 2004 at 11:55:20AM +1000, Eyal Lebedinsky wrote:

> Should the second line be indented?
> 
> Qlogic QLA 1240/1x80/1x160 SCSI support (SCSI_QLOGIC_1280) [M/n/?] m
> Qlogic QLA 1020/1040 SCSI support (SCSI_QLOGIC_1280_1040) [N/y/?] (NEW) y

Correct, SCSI_QLOGIC_1280_1040 should depend on SCSI_QLOGIC_1280.

The patch below does this.

Additionally, it prevents the case that both drivers are built 
statically and both support the 1020/1040.


Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6.10-rc1-mm2-full/drivers/scsi/Kconfig.old	2004-10-29 23:51:39.000000000 +0200
+++ linux-2.6.10-rc1-mm2-full/drivers/scsi/Kconfig	2004-10-29 23:56:42.000000000 +0200
@@ -1288,6 +1288,7 @@
 
 config SCSI_QLOGIC_1280_1040
 	bool "Qlogic QLA 1020/1040 SCSI support"
+	depends on SCSI_QLOGIC_1280 && SCSI_QLOGIC_ISP!=y
 	help
 	  Say Y here if you have a QLogic ISP1020/1040 SCSI host adapter and
 	  do not want to use the old driver.  This option enables support in

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/