diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
| commit | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (patch) | |
| tree | 35b9ab361651f649d3c9aa69f159812eba50d154 /net | |
| parent | dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db (diff) | |
| parent | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
kernel/irq/handle.c
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/Kconfig | 5 |
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. |