aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2016-08-01 20:03:35 -0400
committerMichael S. Tsirkin <mst@redhat.com>2016-08-02 09:54:28 -0400
commit4d93824561057d54712066544609dfc7453b210f (patch)
tree3cadd8f18392c200ae1b59c59722932c14c84028
parentec33d031a14b3c5dd516627139c9550350dbba3e (diff)
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>
-rw-r--r--drivers/misc/mic/Kconfig2
-rw-r--r--drivers/net/caif/Kconfig2
-rw-r--r--drivers/vhost/Kconfig6
-rw-r--r--drivers/vhost/Kconfig.vringh5
4 files changed, 7 insertions, 8 deletions
diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig
index 355bcddb3ed4..6fd9d367dea7 100644
--- a/drivers/misc/mic/Kconfig
+++ b/drivers/misc/mic/Kconfig
@@ -148,5 +148,5 @@ config VOP
148 <http://software.intel.com/en-us/mic-developer>. 148 <http://software.intel.com/en-us/mic-developer>.
149 149
150if VOP 150if VOP
151source "drivers/vhost/Kconfig" 151source "drivers/vhost/Kconfig.vringh"
152endif 152endif
diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig
index 547098086773..f81df91a9ce1 100644
--- a/drivers/net/caif/Kconfig
+++ b/drivers/net/caif/Kconfig
@@ -52,5 +52,5 @@ config CAIF_VIRTIO
52 The caif driver for CAIF over Virtio. 52 The caif driver for CAIF over Virtio.
53 53
54if CAIF_VIRTIO 54if CAIF_VIRTIO
55source "drivers/vhost/Kconfig" 55source "drivers/vhost/Kconfig.vringh"
56endif 56endif
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig
index f77f15bd3b0c..40764ecad9ce 100644
--- a/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@ -33,12 +33,6 @@ config VHOST_VSOCK
33 To compile this driver as a module, choose M here: the module will be called 33 To compile this driver as a module, choose M here: the module will be called
34 vhost_vsock. 34 vhost_vsock.
35 35
36config VHOST_RING
37 tristate
38 ---help---
39 This option is selected by any driver which needs to access
40 the host side of a virtio ring.
41
42config VHOST 36config VHOST
43 tristate 37 tristate
44 ---help--- 38 ---help---
diff --git a/drivers/vhost/Kconfig.vringh b/drivers/vhost/Kconfig.vringh
new file mode 100644
index 000000000000..6a4490c09d7f
--- /dev/null
+++ b/drivers/vhost/Kconfig.vringh
@@ -0,0 +1,5 @@
1config VHOST_RING
2 tristate
3 ---help---
4 This option is selected by any driver which needs to access
5 the host side of a virtio ring.