Merge branch 'linus' into sched/urgent, to pick up dependencies

[deliverable/linux.git] / drivers / vhost / Makefile

diff --git a/drivers/vhost/Makefile b/drivers/vhost/Makefile
index 6b012b986b577d5772c5007e26376c9bc8311ec3..e0441c34db1cf81dff8e327fa38400f0bb44bbd3 100644 (file)
--- a/drivers/vhost/Makefile
+++ b/drivers/vhost/Makefile
@@ -4,9 +4,5 @@ vhost_net-y := net.o
 obj-$(CONFIG_VHOST_SCSI) += vhost_scsi.o
 vhost_scsi-y := scsi.o
 
-obj-$(CONFIG_VHOST_VSOCK) += vhost_vsock.o
-vhost_vsock-y := vsock.o
-
 obj-$(CONFIG_VHOST_RING) += vringh.o
-
 obj-$(CONFIG_VHOST)    += vhost.o