diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 17:08:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-27 17:08:21 -0700 |
| commit | e0aa8afd97536a9d94f82a07b4c4b3f05aef6f82 (patch) | |
| tree | a0ac7eb5814f61f8205ce88d31529f8090b74f2e | |
| parent | e4ff4d7f9d85a2bc714307eb9113617182e62845 (diff) | |
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
| -rw-r--r-- | drivers/scsi/qla2xxx/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/scsi/qla2xxx/Makefile | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig index fccecf67423..6c73b84c6e6 100644 --- a/drivers/scsi/qla2xxx/Kconfig +++ b/drivers/scsi/qla2xxx/Kconfig @@ -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" diff --git a/drivers/scsi/qla2xxx/Makefile b/drivers/scsi/qla2xxx/Makefile index 982b83604b4..00d2e3c21ef 100644 --- a/drivers/scsi/qla2xxx/Makefile +++ b/drivers/scsi/qla2xxx/Makefile @@ -1,5 +1,4 @@ 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 \ |