Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide

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

diff --git a/net/vmw_vsock/Kconfig b/net/vmw_vsock/Kconfig
index 74e0bc887a331202004adae5904417907e8c0c69..14810abedc2ec455adbde24094a5c468477e03d8 100644 (file)
--- a/net/vmw_vsock/Kconfig
+++ b/net/vmw_vsock/Kconfig
@@ -26,21 +26,3 @@ 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 runs on Qemu/KVM.
-
-         To compile this driver as a module, choose M here: the module
-         will be called virtio_vsock_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.