aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-03 02:55:27 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-03 02:55:27 -0500
commitfb53fde9762432d091dac209bdf4f3f850117c55 (patch)
tree607b09022b206a539cb4a924e4ef476443798252 /net
parenteb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff)
parentb1792e367053968f2ddb48bc911d314143ce6242 (diff)
Merge branch 'master' of master.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.