diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-06-14 16:18:53 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-06-14 16:18:53 -0400 |
| commit | 8afecfb0ec961e37e61b2d19c4fa71617a9482de (patch) | |
| tree | c43ea51a47b1e76b762caa4c1b0c356249e5e874 /drivers/vhost/Kconfig | |
| parent | ce1a5ea18ef9bf4c62c75abe7c540a29264ec988 (diff) | |
| parent | d1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff) | |
Merge tag 'v5.2-rc4' into mauro
We need to pick up post-rc1 changes to various document files so they don't
get lost in Mauro's massive RST conversion push.
Diffstat (limited to 'drivers/vhost/Kconfig')
| -rw-r--r-- | drivers/vhost/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index b580885243f7..3d03ccbd1adc 100644 --- a/drivers/vhost/Kconfig +++ b/drivers/vhost/Kconfig | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | config VHOST_NET | 2 | config VHOST_NET |
| 2 | tristate "Host kernel accelerator for virtio net" | 3 | tristate "Host kernel accelerator for virtio net" |
| 3 | depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP) | 4 | depends on NET && EVENTFD && (TUN || !TUN) && (TAP || !TAP) |