Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[linux-2.6-omap-h63xx.git] / net / 9p / Kconfig

diff --git a/net/9p/Kconfig b/net/9p/Kconfig
index 66821cd64a76515ca689f55cf7fae3640d7f8d22..c42c0c400bf9a36176ceedcac6a94083016e5b8d 100644 (file)
--- a/net/9p/Kconfig
+++ b/net/9p/Kconfig
@@ -13,9 +13,22 @@ menuconfig NET_9P
 
          If unsure, say N.
 
+config NET_9P_VIRTIO
+       depends on NET_9P && 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
+       tristate "9P RDMA Transport (Experimental)"
+       help
+         This builds support for a RDMA transport.
+
 config NET_9P_DEBUG
        bool "Debug information"
        depends on NET_9P
        help
-         Say Y if you want the 9P subsistem to log debug information.
+         Say Y if you want the 9P subsystem to log debug information.