diff options
author | Kees Cook <keescook@chromium.org> | 2013-01-16 21:53:56 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 17:52:45 -0500 |
commit | 43893cbefc1b79c94b4809535000c7a306b77360 (patch) | |
tree | 494046ee063d478bd308f685575c568e63bc7e66 /drivers/vhost | |
parent | 6d1f56aa5149082bb0ce6dd8d47e51a1013a206d (diff) |
drivers/vhost: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/vhost')
-rw-r--r-- | drivers/vhost/Kconfig | 4 | ||||
-rw-r--r-- | drivers/vhost/Kconfig.tcm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index 202bba6c997c..bf243177ffe1 100644 --- a/drivers/vhost/Kconfig +++ b/drivers/vhost/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config VHOST_NET | 1 | config VHOST_NET |
2 | tristate "Host kernel accelerator for virtio net (EXPERIMENTAL)" | 2 | tristate "Host kernel accelerator for virtio net" |
3 | depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP) && EXPERIMENTAL | 3 | depends on NET && EVENTFD && (TUN || !TUN) && (MACVTAP || !MACVTAP) |
4 | ---help--- | 4 | ---help--- |
5 | This kernel module can be loaded in host kernel to accelerate | 5 | This kernel module can be loaded in host kernel to accelerate |
6 | guest networking with virtio_net. Not to be confused with virtio_net | 6 | guest networking with virtio_net. Not to be confused with virtio_net |
diff --git a/drivers/vhost/Kconfig.tcm b/drivers/vhost/Kconfig.tcm index a9c6f76e3208..7e3aa28d999e 100644 --- a/drivers/vhost/Kconfig.tcm +++ b/drivers/vhost/Kconfig.tcm | |||
@@ -1,6 +1,6 @@ | |||
1 | config TCM_VHOST | 1 | config TCM_VHOST |
2 | tristate "TCM_VHOST fabric module (EXPERIMENTAL)" | 2 | tristate "TCM_VHOST fabric module" |
3 | depends on TARGET_CORE && EVENTFD && EXPERIMENTAL && m | 3 | depends on TARGET_CORE && EVENTFD && m |
4 | default n | 4 | default n |
5 | ---help--- | 5 | ---help--- |
6 | Say M here to enable the TCM_VHOST fabric module for use with virtio-scsi guests | 6 | Say M here to enable the TCM_VHOST fabric module for use with virtio-scsi guests |