xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ip-roce' into for-next

Browse Source 
Conflicts:
	drivers/infiniband/hw/mlx4/main.c
This commit is contained in:
Roland Dreier
2014-01-22 23:24:21 -08:00
parent 8f399921ea 27cdef637c
commit fb1b5034e4
36 changed files with 955 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/infiniband/Kconfig
View File

@@ -3,6 +3,8 @@ menuconfig INFINIBAND
depends on PCI || BROKEN
depends on HAS_IOMEM
depends on NET
depends on INET
depends on m || IPV6 != m
---help---
Core support for InfiniBand (IB). Make sure to also select
any protocols you wish to use as well as drivers for your
@@ -38,8 +40,7 @@ config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
depends on INET
depends on !(INFINIBAND = y && IPV6 = m)
depends on INFINIBAND
default y
source "drivers/infiniband/hw/mthca/Kconfig"