Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / net / vmw_vsock / Kconfig

diff --git a/net/vmw_vsock/Kconfig b/net/vmw_vsock/Kconfig
index 14810ab..8831e7c 100644 (file)
--- a/net/vmw_vsock/Kconfig
+++ b/net/vmw_vsock/Kconfig
@@ -26,3 +26,23 @@ config VMWARE_VMCI_VSOCKETS
 
          To compile this driver as a module, choose M here: the module
          will be called vmw_vsock_vmci_transport. If unsure, say N.
+
+config VIRTIO_VSOCKETS
+       tristate "virtio transport for Virtual Sockets"
+       depends on VSOCKETS && VIRTIO
+       select VIRTIO_VSOCKETS_COMMON
+       help
+         This module implements a virtio transport for Virtual Sockets.
+
+         Enable this transport if your Virtual Machine host supports Virtual
+         Sockets over virtio.
+
+         To compile this driver as a module, choose M here: the module will be
+         called vmw_vsock_virtio_transport. If unsure, say N.
+
+config VIRTIO_VSOCKETS_COMMON
+       tristate
+       help
+         This option is selected by any driver which needs to access
+         the virtio_vsock.  The module will be called
+         vmw_vsock_virtio_transport_common.