Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / net / caif / Kconfig

diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig
index 60c2142373c99a62d1a5029179c559712928ee43..7ffc756131a214a7b896f81d05e9c499c12cf752 100644 (file)
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@@ -32,13 +32,6 @@ config CAIF_SPI_SYNC
        help to synchronize to the next transfer in case of over or under-runs.
        This option also needs to be enabled on the modem.
 
-config CAIF_SHM
-       tristate "CAIF shared memory protocol driver"
-       depends on CAIF && U5500_MBOX
-       default n
-       ---help---
-       The CAIF shared memory protocol driver for the STE UX5500 platform.
-
 config CAIF_HSI
        tristate "CAIF HSI transport driver"
        depends on CAIF
@@ -47,3 +40,17 @@ config CAIF_HSI
        The caif low level driver for CAIF over HSI.
        Be aware that if you enable this then you also need to
        enable a low-level HSI driver.
+
+config CAIF_VIRTIO
+       tristate "CAIF virtio transport driver"
+       depends on CAIF
+       select VHOST_RING
+       select VIRTIO
+       select GENERIC_ALLOCATOR
+       default n
+       ---help---
+       The caif driver for CAIF over Virtio.
+
+if CAIF_VIRTIO
+source "drivers/vhost/Kconfig"
+endif