aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 11:39:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-15 11:39:09 -0800
commit4d41e121664893e5e338f41fbd36be4a2578c8d6 (patch)
tree3626b5d50600c54ae5eeaa6f317920456fe9deda
parent6ca2cb99377d6315def3c63c2a980a229556bf64 (diff)
parent4ff429e658c00bcf5101eabbebd4f711572a64cb (diff)
downloadlinux-linaro-4d41e121664893e5e338f41fbd36be4a2578c8d6.tar.gz
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
-rw-r--r--net/9p/Kconfig10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/9p/Kconfig b/net/9p/Kconfig
index c42c0c400bf..0663f99e977 100644
--- a/net/9p/Kconfig
+++ b/net/9p/Kconfig
@@ -13,22 +13,24 @@ menuconfig NET_9P
If unsure, say N.
+if NET_9P
+
config NET_9P_VIRTIO
- depends on NET_9P && EXPERIMENTAL && VIRTIO
+ depends on EXPERIMENTAL && VIRTIO
tristate "9P Virtio Transport (Experimental)"
help
This builds support for a transports between
guest partitions and a host partition.
config NET_9P_RDMA
- depends on NET_9P && INFINIBAND && EXPERIMENTAL
+ depends on INET && INFINIBAND && EXPERIMENTAL
tristate "9P RDMA Transport (Experimental)"
help
- This builds support for a RDMA transport.
+ This builds support for an RDMA transport.
config NET_9P_DEBUG
bool "Debug information"
- depends on NET_9P
help
Say Y if you want the 9P subsystem to log debug information.
+endif