Browse Source

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
Linus Torvalds 20 years ago
parent
commit
e0aa8afd97
2 changed files with 0 additions and 2 deletions
  1. 0 1
      drivers/scsi/qla2xxx/Kconfig
  2. 0 1
      drivers/scsi/qla2xxx/Makefile

+ 0 - 1
drivers/scsi/qla2xxx/Kconfig

@@ -2,7 +2,6 @@ config SCSI_QLA2XXX
 	tristate
 	tristate
 	default (SCSI && PCI)
 	default (SCSI && PCI)
 	depends on SCSI && PCI
 	depends on SCSI && PCI
-	select SCSI_FC_ATTRS
 
 
 config SCSI_QLA21XX
 config SCSI_QLA21XX
 	tristate "QLogic ISP2100 host adapter family support"
 	tristate "QLogic ISP2100 host adapter family support"

+ 0 - 1
drivers/scsi/qla2xxx/Makefile

@@ -1,5 +1,4 @@
 EXTRA_CFLAGS += -DUNIQUE_FW_NAME
 EXTRA_CFLAGS += -DUNIQUE_FW_NAME
-CONFIG_SCSI_QLA24XX=m
 EXTRA_CFLAGS += -DCONFIG_SCSI_QLA24XX -DCONFIG_SCSI_QLA24XX_MODULE
 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 \
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \