diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-15 14:39:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-15 14:39:09 -0500 |
| commit | 4d41e121664893e5e338f41fbd36be4a2578c8d6 (patch) | |
| tree | 3626b5d50600c54ae5eeaa6f317920456fe9deda /net | |
| parent | 6ca2cb99377d6315def3c63c2a980a229556bf64 (diff) | |
| parent | 4ff429e658c00bcf5101eabbebd4f711572a64cb (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: restrict RDMA usage
Diffstat (limited to 'net')
| -rw-r--r-- | net/9p/Kconfig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/9p/Kconfig b/net/9p/Kconfig index c42c0c400bf9..0663f99e977a 100644 --- a/net/9p/Kconfig +++ b/net/9p/Kconfig | |||
| @@ -13,22 +13,24 @@ menuconfig NET_9P | |||
| 13 | 13 | ||
| 14 | If unsure, say N. | 14 | If unsure, say N. |
| 15 | 15 | ||
| 16 | if NET_9P | ||
| 17 | |||
| 16 | config NET_9P_VIRTIO | 18 | config NET_9P_VIRTIO |
| 17 | depends on NET_9P && EXPERIMENTAL && VIRTIO | 19 | depends on EXPERIMENTAL && VIRTIO |
| 18 | tristate "9P Virtio Transport (Experimental)" | 20 | tristate "9P Virtio Transport (Experimental)" |
| 19 | help | 21 | help |
| 20 | This builds support for a transports between | 22 | This builds support for a transports between |
| 21 | guest partitions and a host partition. | 23 | guest partitions and a host partition. |
| 22 | 24 | ||
| 23 | config NET_9P_RDMA | 25 | config NET_9P_RDMA |
| 24 | depends on NET_9P && INFINIBAND && EXPERIMENTAL | 26 | depends on INET && INFINIBAND && EXPERIMENTAL |
| 25 | tristate "9P RDMA Transport (Experimental)" | 27 | tristate "9P RDMA Transport (Experimental)" |
| 26 | help | 28 | help |
| 27 | This builds support for a RDMA transport. | 29 | This builds support for an RDMA transport. |
| 28 | 30 | ||
| 29 | config NET_9P_DEBUG | 31 | config NET_9P_DEBUG |
| 30 | bool "Debug information" | 32 | bool "Debug information" |
| 31 | depends on NET_9P | ||
| 32 | help | 33 | help |
| 33 | Say Y if you want the 9P subsystem to log debug information. | 34 | Say Y if you want the 9P subsystem to log debug information. |
| 34 | 35 | ||
| 36 | endif | ||
