提交 1558310d 编写于 作者: D Dimitris Michailidis 提交者: David S. Miller

cxgb{3,4}*: improve Kconfig dependencies

- Remove the dependency of cxgb4 and cxgb4vf on INET.  cxgb3 really
  depends on INET, keep it but add it directly to the driver's Kconfig
  entry.
- Make the iSCSI drivers cxgb3i and cxgb4i available in the SCSI menu
  without requiring any options in the net driver menu to be enabled
  first.  Add needed selects so the iSCSI drivers can build their
  corresponding net drivers.
- Remove CHELSIO_T*_DEPENDS.
Signed-off-by: NDimitris Michailidis <dm@chelsio.com>
Acked-by: NJan Beulich <jbeulich@novell.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 dc6ed1df
...@@ -2595,14 +2595,9 @@ config CHELSIO_T1_1G ...@@ -2595,14 +2595,9 @@ 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 CHELSIO_T3_DEPENDS depends on PCI && INET
select FW_LOADER select FW_LOADER
select MDIO select MDIO
help help
...@@ -2620,14 +2615,9 @@ config CHELSIO_T3 ...@@ -2620,14 +2615,9 @@ config CHELSIO_T3
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called cxgb3. will be called cxgb3.
config CHELSIO_T4_DEPENDS
tristate
depends on PCI && INET
default y
config CHELSIO_T4 config CHELSIO_T4
tristate "Chelsio Communications T4 Ethernet support" tristate "Chelsio Communications T4 Ethernet support"
depends on CHELSIO_T4_DEPENDS depends on PCI
select FW_LOADER select FW_LOADER
select MDIO select MDIO
help help
...@@ -2645,14 +2635,9 @@ config CHELSIO_T4 ...@@ -2645,14 +2635,9 @@ config CHELSIO_T4
To compile this driver as a module choose M here; the module To compile this driver as a module choose M here; the module
will be called cxgb4. will be called cxgb4.
config CHELSIO_T4VF_DEPENDS
tristate
depends on PCI && INET
default y
config CHELSIO_T4VF config CHELSIO_T4VF
tristate "Chelsio Communications T4 Virtual Function Ethernet support" tristate "Chelsio Communications T4 Virtual Function Ethernet support"
depends on CHELSIO_T4VF_DEPENDS depends on PCI
help help
This driver supports Chelsio T4-based gigabit and 10Gb Ethernet This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
adapters with PCI-E SR-IOV Virtual Functions. adapters with PCI-E SR-IOV Virtual Functions.
......
config SCSI_CXGB3_ISCSI config SCSI_CXGB3_ISCSI
tristate "Chelsio T3 iSCSI support" tristate "Chelsio T3 iSCSI support"
depends on CHELSIO_T3_DEPENDS depends on PCI && INET
select NETDEVICES
select NETDEV_10000
select CHELSIO_T3 select CHELSIO_T3
select SCSI_ISCSI_ATTRS select SCSI_ISCSI_ATTRS
---help--- ---help---
......
config SCSI_CXGB4_ISCSI config SCSI_CXGB4_ISCSI
tristate "Chelsio T4 iSCSI support" tristate "Chelsio T4 iSCSI support"
depends on CHELSIO_T4_DEPENDS depends on PCI && INET
select NETDEVICES
select NETDEV_10000
select CHELSIO_T4 select CHELSIO_T4
select SCSI_ISCSI_ATTRS select SCSI_ISCSI_ATTRS
---help--- ---help---
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册