From 50a54894ad64c14c8c2e3cd8d533bf510d08b910 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Tue, 30 Dec 2008 10:20:24 -0600 Subject: [PATCH] --- yaml --- r: 124694 b: refs/heads/master c: 58daa68a8fd4a373092df9035fdccaa29420f1e6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/Kconfig | 7 ++++++- trunk/drivers/scsi/cxgb3i/Kconfig | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e117c374c041..705c122cccbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56b854bb314084396d3d3138126496d330943559 +refs/heads/master: 58daa68a8fd4a373092df9035fdccaa29420f1e6 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 72a9212da865..9a18270c1081 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -2399,9 +2399,14 @@ 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 PCI && INET + depends on CHELSIO_T3_DEPENDS select FW_LOADER select INET_LRO help diff --git a/trunk/drivers/scsi/cxgb3i/Kconfig b/trunk/drivers/scsi/cxgb3i/Kconfig index 276281460ece..bfdcaf5c9c57 100644 --- a/trunk/drivers/scsi/cxgb3i/Kconfig +++ b/trunk/drivers/scsi/cxgb3i/Kconfig @@ -1,5 +1,6 @@ config SCSI_CXGB3_ISCSI tristate "Chelsio S3xx iSCSI support" + depends on CHELSIO_T3_DEPENDS select CHELSIO_T3 select SCSI_ISCSI_ATTRS ---help---