diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-05 03:51:58 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-05 03:51:58 +0300 |
commit | 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5 (patch) | |
tree | bc3ef1b64dcdb48b2d6accb51951a0d73b33262e /net | |
parent | 4d7902f22b0804730b80f7a4147f676430248a3a (diff) | |
parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
download | linux-005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5.tar.xz |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig index dcef600d0bf5..5592883e1e4a 100644 --- a/net/sunrpc/Kconfig +++ b/net/sunrpc/Kconfig @@ -6,7 +6,7 @@ config SUNRPC_GSS config SUNRPC_XPRT_RDMA tristate - depends on SUNRPC && INFINIBAND && EXPERIMENTAL + depends on SUNRPC && INFINIBAND && INFINIBAND_ADDR_TRANS && EXPERIMENTAL default SUNRPC && INFINIBAND help This option allows the NFS client and server to support |