[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>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 72a9212da865ebcd9e59c1198c3c2cb79c06df7a..9a18270c108172c29657063057ed0cc5e5e9258d 100644 (file)
--- 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 276281460ecef9e8510343694c7039e57828e221..bfdcaf5c9c57f6c8a6c1672b4ba9336d496fb6e2 100644 (file)
--- 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---