From ec5d426be248b0f44e1e26f059267cd267e96cfa Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Tue, 2 Aug 2016 01:53:13 +0300 Subject: [PATCH] UPSTREAM: vhost: drop vringh dependency vringh isn't used by vhost net or scsi - it's used by CAIF only at the moment. Drop the dependency. Signed-off-by: Michael S. Tsirkin (cherry picked from commit 6190efb08c16dcd68c64b096a28f47ab33f017d7) Bug: 121166534 Test: Ran cuttlefish with android-4.4 + VSOCKETS, VMWARE_VMCI_VSOCKETS Signed-off-by: Alistair Strachan Change-Id: I9db24d3ced664637cffcf27fde8a1c08962bbebe --- drivers/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/Makefile b/drivers/Makefile index 69d2ec997564..a8167ee6d865 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -140,6 +140,7 @@ obj-$(CONFIG_OF) += of/ obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_BCMA) += bcma/ obj-$(CONFIG_VHOST_RING) += vhost/ +obj-$(CONFIG_VHOST) += vhost/ obj-$(CONFIG_VLYNQ) += vlynq/ obj-$(CONFIG_STAGING) += staging/ obj-y += platform/