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: Dimitris Michailidis <dm@chelsio.com>
Acked-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 18 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f4b39274308a..6e09d5fea221 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2595,14 +2595,9 @@ 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 CHELSIO_T3_DEPENDS
+        depends on PCI && INET
         select FW_LOADER
         select MDIO
         help
@@ -2620,14 +2615,9 @@ config CHELSIO_T3
           To compile this driver as a module, choose M here: the module
           will be called cxgb3.
 
-config CHELSIO_T4_DEPENDS
-        tristate
-        depends on PCI && INET
-        default y
-
 config CHELSIO_T4
         tristate "Chelsio Communications T4 Ethernet support"
-        depends on CHELSIO_T4_DEPENDS
+        depends on PCI
         select FW_LOADER
         select MDIO
         help
@@ -2645,14 +2635,9 @@ config CHELSIO_T4
           To compile this driver as a module choose M here; the module
           will be called cxgb4.
 
-config CHELSIO_T4VF_DEPENDS
-        tristate
-        depends on PCI && INET
-        default y
-
 config CHELSIO_T4VF
         tristate "Chelsio Communications T4 Virtual Function Ethernet support"
-        depends on CHELSIO_T4VF_DEPENDS
+        depends on PCI
         help
           This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
           adapters with PCI-E SR-IOV Virtual Functions.