diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-30 16:20:24 (GMT) |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-12-30 19:09:12 (GMT) |
| commit | 58daa68a8fd4a373092df9035fdccaa29420f1e6 (patch) | |
| tree | 352682ed8b8dc36f63700c37f9cacf1958039456 | |
| parent | 56b854bb314084396d3d3138126496d330943559 (diff) | |
| download | linux-58daa68a8fd4a373092df9035fdccaa29420f1e6.tar.xz | |
[SCSI] cxgb3i: fix select/depend problem
cxgb3i requires the cxgb3 net driver, so it selects it. However,
cxgb3 has dependencies which the select cannot see. Fix this by
separating out the cxgb3 dependencies into a separate hidden config
option (CONFIG_CHELSIO_T3_DEPENDS) and make both cxgb3 and cxgb3i
depend on it.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Karen Xie <kxie@chelsio.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
| -rw-r--r-- | drivers/net/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/scsi/cxgb3i/Kconfig | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 72a9212..9a18270 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2399,9 +2399,14 @@ config CHELSIO_T1_1G Enables support for Chelsio's gigabit Ethernet PCI cards. If you are using only 10G cards say 'N' here. +config CHELSIO_T3_DEPENDS + tristate + depends on PCI && INET + default y + config CHELSIO_T3 tristate "Chelsio Communications T3 10Gb Ethernet support" - depends on PCI && INET + depends on CHELSIO_T3_DEPENDS select FW_LOADER select INET_LRO help diff --git a/drivers/scsi/cxgb3i/Kconfig b/drivers/scsi/cxgb3i/Kconfig index 2762814..bfdcaf5 100644 --- a/drivers/scsi/cxgb3i/Kconfig +++ b/drivers/scsi/cxgb3i/Kconfig @@ -1,5 +1,6 @@ config SCSI_CXGB3_ISCSI tristate "Chelsio S3xx iSCSI support" + depends on CHELSIO_T3_DEPENDS select CHELSIO_T3 select SCSI_ISCSI_ATTRS ---help--- |