Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / net / 9p / Kconfig

diff --git a/net/9p/Kconfig b/net/9p/Kconfig
index eecbf12f6393eefebd8bb41b3419f9f94032682e..ff34c5acc1309ea7cdb2c8e60e73740cd23264a6 100644 (file)
--- a/net/9p/Kconfig
+++ b/net/9p/Kconfig
@@ -13,19 +13,16 @@ 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)"
+config NET_9P_VIRTIO
+       depends on NET_9P && EXPERIMENTAL && VIRTIO
+       tristate "9P Virtio Transport (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.
+         This builds support for a transports between
+         guest partitions and a host partition.
 
 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.