Skip to contentSkip to conversation

remove CONFIG_SCSI_QLOGIC_1280_1040

PATCH In review Christoph Hellwig 2 participants 2 messages Nov 10, 2005

Subsystems (2)
SCSI QLogic QLA1280 SCSI driver
lore
Share & tools
lore

Christoph Hellwig

author
#0 lore raw

PATCH 1/1 remove CONFIG_SCSI_QLOGIC_1280_1040

now that qlogicisp is gone there is not reason not to support the 1040 unconditionally in qla1280.

Would be nice to get this into 2.6.15 still.

Signed-off-by Christoph Hellwig <[email protected]>
drivers/scsi/Kconfig +0 -8
Index: linux-2.6/drivers/scsi/Kconfig
===================================================================
@@ -1342,14 +1342,6 @@
 	  To compile this driver as a module, choose M here: the
 	  module will be called qla1280.
 
-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
-	  the qla1280 driver for those host adapters.
-
 config SCSI_QLOGICPTI
 	tristate "PTI Qlogic, ISP Driver"
 	depends on SBUS && SCSI
drivers/scsi/qla1280.c +0 -2
Index: linux-2.6/drivers/scsi/qla1280.c
===================================================================
@@ -639,10 +639,8 @@
 static struct pci_device_id qla1280_pci_tbl[] = {
 	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP12160,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-#ifdef CONFIG_SCSI_QLOGIC_1280_1040
 	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
-#endif
 	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1080,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
 	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1240,
#1 lore raw
Quoted 4 lines · Christoph Hellwig

now that qlogicisp is gone there is not reason not to support the 1040 unconditionally in qla1280.

Would be nice to get this into 2.6.15 still.

Adrian Bunk already beat you to this. It was part of the isp removal patch ...

James