aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/Kconfig21
-rw-r--r--drivers/scsi/cxgbi/cxgb3i/Kconfig4
-rw-r--r--drivers/scsi/cxgbi/cxgb4i/Kconfig4
3 files changed, 9 insertions, 20 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
2595 Enables support for Chelsio's gigabit Ethernet PCI cards. If you 2595 Enables support for Chelsio's gigabit Ethernet PCI cards. If you
2596 are using only 10G cards say 'N' here. 2596 are using only 10G cards say 'N' here.
2597 2597
2598config CHELSIO_T3_DEPENDS
2599 tristate
2600 depends on PCI && INET
2601 default y
2602
2603config CHELSIO_T3 2598config CHELSIO_T3
2604 tristate "Chelsio Communications T3 10Gb Ethernet support" 2599 tristate "Chelsio Communications T3 10Gb Ethernet support"
2605 depends on CHELSIO_T3_DEPENDS 2600 depends on PCI && INET
2606 select FW_LOADER 2601 select FW_LOADER
2607 select MDIO 2602 select MDIO
2608 help 2603 help
@@ -2620,14 +2615,9 @@ config CHELSIO_T3
2620 To compile this driver as a module, choose M here: the module 2615 To compile this driver as a module, choose M here: the module
2621 will be called cxgb3. 2616 will be called cxgb3.
2622 2617
2623config CHELSIO_T4_DEPENDS
2624 tristate
2625 depends on PCI && INET
2626 default y
2627
2628config CHELSIO_T4 2618config CHELSIO_T4
2629 tristate "Chelsio Communications T4 Ethernet support" 2619 tristate "Chelsio Communications T4 Ethernet support"
2630 depends on CHELSIO_T4_DEPENDS 2620 depends on PCI
2631 select FW_LOADER 2621 select FW_LOADER
2632 select MDIO 2622 select MDIO
2633 help 2623 help
@@ -2645,14 +2635,9 @@ config CHELSIO_T4
2645 To compile this driver as a module choose M here; the module 2635 To compile this driver as a module choose M here; the module
2646 will be called cxgb4. 2636 will be called cxgb4.
2647 2637
2648config CHELSIO_T4VF_DEPENDS
2649 tristate
2650 depends on PCI && INET
2651 default y
2652
2653config CHELSIO_T4VF 2638config CHELSIO_T4VF
2654 tristate "Chelsio Communications T4 Virtual Function Ethernet support" 2639 tristate "Chelsio Communications T4 Virtual Function Ethernet support"
2655 depends on CHELSIO_T4VF_DEPENDS 2640 depends on PCI
2656 help 2641 help
2657 This driver supports Chelsio T4-based gigabit and 10Gb Ethernet 2642 This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
2658 adapters with PCI-E SR-IOV Virtual Functions. 2643 adapters with PCI-E SR-IOV Virtual Functions.
diff --git a/drivers/scsi/cxgbi/cxgb3i/Kconfig b/drivers/scsi/cxgbi/cxgb3i/Kconfig
index 5cf4e9831f1b..11dff23f7838 100644
--- a/drivers/scsi/cxgbi/cxgb3i/Kconfig
+++ b/drivers/scsi/cxgbi/cxgb3i/Kconfig
@@ -1,6 +1,8 @@
1config SCSI_CXGB3_ISCSI 1config SCSI_CXGB3_ISCSI
2 tristate "Chelsio T3 iSCSI support" 2 tristate "Chelsio T3 iSCSI support"
3 depends on CHELSIO_T3_DEPENDS 3 depends on PCI && INET
4 select NETDEVICES
5 select NETDEV_10000
4 select CHELSIO_T3 6 select CHELSIO_T3
5 select SCSI_ISCSI_ATTRS 7 select SCSI_ISCSI_ATTRS
6 ---help--- 8 ---help---
diff --git a/drivers/scsi/cxgbi/cxgb4i/Kconfig b/drivers/scsi/cxgbi/cxgb4i/Kconfig
index bb94b39b17b3..d5302c27f377 100644
--- a/drivers/scsi/cxgbi/cxgb4i/Kconfig
+++ b/drivers/scsi/cxgbi/cxgb4i/Kconfig
@@ -1,6 +1,8 @@
1config SCSI_CXGB4_ISCSI 1config SCSI_CXGB4_ISCSI
2 tristate "Chelsio T4 iSCSI support" 2 tristate "Chelsio T4 iSCSI support"
3 depends on CHELSIO_T4_DEPENDS 3 depends on PCI && INET
4 select NETDEVICES
5 select NETDEV_10000
4 select CHELSIO_T4 6 select CHELSIO_T4
5 select SCSI_ISCSI_ATTRS 7 select SCSI_ISCSI_ATTRS
6 ---help--- 8 ---help---