Procházet zdrojové kódy

[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>
James Bottomley před 16 roky
rodič
revize
58daa68a8f
2 změnil soubory, kde provedl 7 přidání a 1 odebrání
  1. 6 1
      drivers/net/Kconfig
  2. 1 0
      drivers/scsi/cxgb3i/Kconfig

+ 6 - 1
drivers/net/Kconfig

@@ -2399,9 +2399,14 @@ config CHELSIO_T1_1G
           Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
           Enables support for Chelsio's gigabit Ethernet PCI cards.  If you
           are using only 10G cards say 'N' here.
           are using only 10G cards say 'N' here.
 
 
+config CHELSIO_T3_DEPENDS
+	tristate
+	depends on PCI && INET
+	default y
+
 config CHELSIO_T3
 config CHELSIO_T3
 	tristate "Chelsio Communications T3 10Gb Ethernet support"
 	tristate "Chelsio Communications T3 10Gb Ethernet support"
-	depends on PCI && INET
+	depends on CHELSIO_T3_DEPENDS
 	select FW_LOADER
 	select FW_LOADER
 	select INET_LRO
 	select INET_LRO
 	help
 	help

+ 1 - 0
drivers/scsi/cxgb3i/Kconfig

@@ -1,5 +1,6 @@
 config SCSI_CXGB3_ISCSI
 config SCSI_CXGB3_ISCSI
 	tristate "Chelsio S3xx iSCSI support"
 	tristate "Chelsio S3xx iSCSI support"
+	depends on CHELSIO_T3_DEPENDS
 	select CHELSIO_T3
 	select CHELSIO_T3
 	select SCSI_ISCSI_ATTRS
 	select SCSI_ISCSI_ATTRS
 	---help---
 	---help---