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

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

diff --git a/drivers/vhost/Makefile b/drivers/vhost/Makefile
index 654e9af..e0441c3 100644 (file)
--- a/drivers/vhost/Makefile
+++ b/drivers/vhost/Makefile
@@ -1,7 +1,8 @@
 obj-$(CONFIG_VHOST_NET) += vhost_net.o
-vhost_net-y := vhost.o net.o
+vhost_net-y := net.o
 
 obj-$(CONFIG_VHOST_SCSI) += vhost_scsi.o
 vhost_scsi-y := scsi.o
 
 obj-$(CONFIG_VHOST_RING) += vringh.o
+obj-$(CONFIG_VHOST)    += vhost.o