vhost: split out vringh Kconfig

vringh is pulled in by caif and mic, but the other
vhost config does not need to be there.
In particular, it makes no sense to have vhost net/scsi/sock
under caif/mic.

Create a separate Kconfig file and put vringh bits there.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig
index 355bcddb3ed437f553c4b66e739a03a9fa436392..6fd9d367dea709afa03894ad4b55dde3f4606872 100644 (file)
--- a/drivers/misc/mic/Kconfig
+++ b/drivers/misc/mic/Kconfig
@@ -148,5 +148,5 @@ config VOP
          <http://software.intel.com/en-us/mic-developer>.
 
 if VOP
-source "drivers/vhost/Kconfig"
+source "drivers/vhost/Kconfig.vringh"
 endif

diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig
index 547098086773cd06a936a4010bb8b66ffc933dfd..f81df91a9ce16dc41aca93276528e3e72e066ad4 100644 (file)
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@@ -52,5 +52,5 @@ config CAIF_VIRTIO
        The caif driver for CAIF over Virtio.
 
 if CAIF_VIRTIO
-source "drivers/vhost/Kconfig"
+source "drivers/vhost/Kconfig.vringh"
 endif

diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
index f77f15bd3b0c0307f70f8fe58163daec676ae9ed..40764ecad9ce16724535b9867bb6a1aa7758403b 100644 (file)
--- a/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@ -33,12 +33,6 @@ config VHOST_VSOCK
        To compile this driver as a module, choose M here: the module will be called
        vhost_vsock.
 
-config VHOST_RING
-       tristate
-       ---help---
-         This option is selected by any driver which needs to access
-         the host side of a virtio ring.
-
 config VHOST
        tristate
        ---help---

diff --git a/drivers/vhost/Kconfig.vringh b/drivers/vhost/Kconfig.vringh
new file mode 100644 (file)
index 0000000..6a4490c
--- /dev/null
+++ b/drivers/vhost/Kconfig.vringh
@@ -0,0 +1,5 @@
+config VHOST_RING
+       tristate
+       ---help---
+         This option is selected by any driver which needs to access
+         the host side of a virtio ring.