diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-27 01:46:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-27 01:46:15 +0200 |
| commit | 5b79c2af667c0e2684f2a6dbf6439074b78f490c (patch) | |
| tree | efda2b94317c914fef0bfb25fe5ada9e253d5415 /net/rds/Kconfig | |
| parent | net: dsa: dsa_loop: Make dynamic debugging helpful (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-5b79c2af667c0e2684f2a6dbf6439074b78f490c.tar.xz linux-5b79c2af667c0e2684f2a6dbf6439074b78f490c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of easy overlapping changes in the confict
resolutions here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/Kconfig')
| -rw-r--r-- | net/rds/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/Kconfig b/net/rds/Kconfig index bffde4b46c5d..1a31502ee7db 100644 --- a/net/rds/Kconfig +++ b/net/rds/Kconfig @@ -8,7 +8,7 @@ config RDS config RDS_RDMA tristate "RDS over Infiniband" - depends on RDS && INFINIBAND && INFINIBAND_ADDR_TRANS + depends on RDS && INFINIBAND_ADDR_TRANS ---help--- Allow RDS to use Infiniband as a transport. This transport supports RDMA operations. |