summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDimitris Michailidis <dm@chelsio.com>2011-02-28 17:34:15 +0000
committerDavid S. Miller <davem@davemloft.net>2011-03-02 22:22:51 -0800
commit1558310d4942427f4fd19e8ae26ca0878ab10879 (patch)
treee00e7a298d66b05b8082157c5ebd566c6d868673 /drivers/scsi
parentdc6ed1df5a5f84e45e77e2acb6fd99b995414956 (diff)
downloadblackbird-obmc-linux-1558310d4942427f4fd19e8ae26ca0878ab10879.tar.gz
blackbird-obmc-linux-1558310d4942427f4fd19e8ae26ca0878ab10879.zip
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/cxgbi/cxgb3i/Kconfig4
-rw-r--r--drivers/scsi/cxgbi/cxgb4i/Kconfig4
2 files changed, 6 insertions, 2 deletions
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 @@
config SCSI_CXGB3_ISCSI
tristate "Chelsio T3 iSCSI support"
- depends on CHELSIO_T3_DEPENDS
+ depends on PCI && INET
+ select NETDEVICES
+ select NETDEV_10000
select CHELSIO_T3
select SCSI_ISCSI_ATTRS
---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 @@
config SCSI_CXGB4_ISCSI
tristate "Chelsio T4 iSCSI support"
- depends on CHELSIO_T4_DEPENDS
+ depends on PCI && INET
+ select NETDEVICES
+ select NETDEV_10000
select CHELSIO_T4
select SCSI_ISCSI_ATTRS
---help---
OpenPOWER on IntegriCloud