Commit e0aa8afd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Fix up qla2xxx configuration bogosity 

If we haven't configured the qla24xx driver, then the Makefile shouldn't
do it for us.

This also means that we can avoid the unnecessary selection of FC_ATTRS.

Debugged by James Bottomley
parent e4ff4d7f

drivers/scsi/qla2xxx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config SCSI_QLA2XXX 
	tristate

	default (SCSI && PCI)

	depends on SCSI && PCI

	select SCSI_FC_ATTRS



config SCSI_QLA21XX

	tristate "QLogic ISP2100 host adapter family support"

drivers/scsi/qla2xxx/Makefile

+0 −1
Original line number Diff line number Diff line 
EXTRA_CFLAGS += -DUNIQUE_FW_NAME

CONFIG_SCSI_QLA24XX=m

EXTRA_CFLAGS += -DCONFIG_SCSI_QLA24XX -DCONFIG_SCSI_QLA24XX_MODULE



qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \

CRA Git | Maintained and supported by SUSTech CRA and CCSE