diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2016-08-02 01:53:13 +0300 |
|---|---|---|
| committer | Alistair Strachan <astrachan@google.com> | 2019-05-14 17:56:57 -0700 |
| commit | f328aa45f9bc10286e07bc784195b4f0dac2fe37 (patch) | |
| tree | 95a05dabe2c3d644196aa91e543b3a202a92ebf8 | |
| parent | e3331f90e050e810c312fdda9d135952607684e9 (diff) | |
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 <mst@redhat.com>
(cherry picked from commit 6190efb08c16dcd68c64b096a28f47ab33f017d7)
Bug: 121166534
Test: Ran cuttlefish with android-4.4 + VSOCKETS, VMWARE_VMCI_VSOCKETS
Signed-off-by: Cody Schuffelen <schuffelen@google.com>
Change-Id: I2373bf9a5cd21d350af3aca957df811c6aaeae63
| -rw-r--r-- | drivers/vhost/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index 2b5f588f5b1e..f77f15bd3b0c 100644 --- a/drivers/vhost/Kconfig +++ b/drivers/vhost/Kconfig @@ -2,7 +2,6 @@ config VHOST_NET tristate "Host kernel accelerator for virtio net" depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP) select VHOST - select VHOST_RING ---help--- This kernel module can be loaded in host kernel to accelerate guest networking with virtio_net. Not to be confused with virtio_net @@ -15,7 +14,6 @@ config VHOST_SCSI tristate "VHOST_SCSI TCM fabric driver" depends on TARGET_CORE && EVENTFD && m select VHOST - select VHOST_RING default n ---help--- Say M here to enable the vhost_scsi TCM fabric module |