aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFelix Blyakher <felixb@sgi.com>2009-01-29 17:55:56 -0500
committerFelix Blyakher <felixb@sgi.com>2009-01-29 17:55:56 -0500
commita1a1415e5ea2d2241df208a7777a4f38aba9ed5a (patch)
tree356ea7846023503e92e1d5faca68debf1b77a23e /net
parentaaca4ff0917f62433f222f9fb0d04c1d61ad68cf (diff)
parent18e352e4a73465349711a9324767e1b2453383e2 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index eda4a7aee596..dcef600d0bf5 100644
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -9,9 +9,8 @@ config SUNRPC_XPRT_RDMA
9 depends on SUNRPC && INFINIBAND && EXPERIMENTAL 9 depends on SUNRPC && INFINIBAND && EXPERIMENTAL
10 default SUNRPC && INFINIBAND 10 default SUNRPC && INFINIBAND
11 help 11 help
12 This option enables an RPC client transport capability that 12 This option allows the NFS client and server to support
13 allows the NFS client to mount servers via an RDMA-enabled 13 an RDMA-enabled transport.
14 transport.
15 14
16 To compile RPC client RDMA transport support as a module, 15 To compile RPC client RDMA transport support as a module,
17 choose M here: the module will be called xprtrdma. 16 choose M here: the module will be called xprtrdma.