mirror of
https://github.com/rd-stuffs/msm-4.14.git
synced 2025-03-24 12:17:26 +08:00
Merge branch 'bnx2-deps'
Anish Bhatt says: ==================== net: Fix randconfig errros in bnx2i/bnx2fc caused by IPV6 Just like CNIC bnx2i/bnx2fc also have their tristate dependent on IPV6, however using the same solution as CNIC can cause recursive dependecies during make. Based on suggestions by Randy Dunlap, SCSI_NETLINK now depends on NET instead of selecting NET. Second patch fixes the actual randconfig error. Entire thread can be followed here : https://lkml.org/lkml/2014/9/9/500 Fixes: c99d667e8527 ("cnic : Cleanup CONFIG_IPV6 & VLAN check") ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
fe42048e2a
@ -43,7 +43,7 @@ config SCSI_DMA
|
||||
config SCSI_NETLINK
|
||||
bool
|
||||
default n
|
||||
select NET
|
||||
depends on NET
|
||||
|
||||
config SCSI_PROC_FS
|
||||
bool "legacy /proc/scsi/ support"
|
||||
|
@ -1,6 +1,7 @@
|
||||
config SCSI_BNX2X_FCOE
|
||||
tristate "QLogic NetXtreme II FCoE support"
|
||||
depends on PCI
|
||||
depends on (IPV6 || IPV6=n)
|
||||
select NETDEVICES
|
||||
select ETHERNET
|
||||
select NET_VENDOR_BROADCOM
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user