From 4d93824561057d54712066544609dfc7453b210f Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Tue, 2 Aug 2016 03:03:35 +0300 Subject: [PATCH] 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 --- drivers/misc/mic/Kconfig | 2 +- drivers/net/caif/Kconfig | 2 +- drivers/vhost/Kconfig | 6 ------ drivers/vhost/Kconfig.vringh | 5 +++++ 4 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 drivers/vhost/Kconfig.vringh diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig index 355bcddb3ed43..6fd9d367dea70 100644 --- a/drivers/misc/mic/Kconfig +++ b/drivers/misc/mic/Kconfig @@ -148,5 +148,5 @@ config VOP . 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 547098086773c..f81df91a9ce16 100644 --- 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 f77f15bd3b0c0..40764ecad9ce1 100644 --- 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 index 0000000000000..6a4490c09d7fd --- /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.