Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[safe/jmp/linux-2.6] / net / 9p / Kconfig

diff --git a/net/9p/Kconfig b/net/9p/Kconfig
index bafc50c..7ed75c7 100644 (file)
--- a/net/9p/Kconfig
+++ b/net/9p/Kconfig
@@ -13,26 +13,24 @@ menuconfig NET_9P
 
          If unsure, say N.
 
-config NET_9P_FD
-       depends on NET_9P
-       default y if NET_9P
-       tristate "9P File Descriptor Transports (Experimental)"
-       help
-         This builds support for file descriptor transports for 9p
-         which includes support for TCP/IP, named pipes, or passed
-         file descriptors.  TCP/IP is the default transport for 9p,
-         so if you are going to use 9p, you'll likely want this.
+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 INET && INFINIBAND && INFINIBAND_ADDR_TRANS && EXPERIMENTAL
+       tristate "9P RDMA Transport (Experimental)"
+       help
+         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