summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/bnx2i
diff options
context:
space:
mode:
authorAnish Bhatt <anish@chelsio.com>2014-09-15 13:45:21 -0700
committerDavid S. Miller <davem@davemloft.net>2014-09-15 17:45:18 -0400
commit23a3c99201954d8ffe92e599e3c3039985280f1b (patch)
treef7bf9d856db7fed8f823a097567d5b8a3d396132 /drivers/scsi/bnx2i
parent5d6be6a5d4864712832822efeb9c2d54e4063949 (diff)
downloadblackbird-op-linux-23a3c99201954d8ffe92e599e3c3039985280f1b.tar.gz
blackbird-op-linux-23a3c99201954d8ffe92e599e3c3039985280f1b.zip
bnx2i/bnx2fc : fix randconfig error in next-20140909
Just like CNIC, tristate of these two modules is also dependent on IPV6. These need to be handled separately as they select CNIC, which can override tristate for CNIC from 'm' to 'y', which can cause build failures when ipv6 is compiled as a module even if CNIC's Kconfig will only 'm' or 'n' when ipv6 is compiled as a module. Fixes: c99d667e8527 ("cnic : Cleanup CONFIG_IPV6 & VLAN check") Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/bnx2i')
-rw-r--r--drivers/scsi/bnx2i/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/bnx2i/Kconfig b/drivers/scsi/bnx2i/Kconfig
index 44ce54e536e5..ba30ff86d581 100644
--- a/drivers/scsi/bnx2i/Kconfig
+++ b/drivers/scsi/bnx2i/Kconfig
@@ -2,6 +2,7 @@ config SCSI_BNX2_ISCSI
tristate "QLogic NetXtreme II iSCSI support"
depends on NET
depends on PCI
+ depends on (IPV6 || IPV6=n)
select SCSI_ISCSI_ATTRS
select NETDEVICES
select ETHERNET
OpenPOWER on IntegriCloud