diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 09:34:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 09:34:02 +0200 |
| commit | 48a4cc950348c507580df79632ad53d8a08b6c0e (patch) | |
| tree | db4acee92253bf2fb7c7447d8b0bac9431d6a1fa /drivers/misc/mic | |
| parent | 3275158fa52ad2a795f7f52ba4565ea92660c296 (diff) | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
| download | linux-stable-48a4cc950348c507580df79632ad53d8a08b6c0e.tar.gz linux-stable-48a4cc950348c507580df79632ad53d8a08b6c0e.tar.bz2 linux-stable-48a4cc950348c507580df79632ad53d8a08b6c0e.zip | |
Merge 5.7-rc3 into char-misc-next
We need the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mic')
| -rw-r--r-- | drivers/misc/mic/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig index 8f201d019f5a..3bfe72c59864 100644 --- a/drivers/misc/mic/Kconfig +++ b/drivers/misc/mic/Kconfig @@ -116,7 +116,7 @@ config MIC_COSM config VOP tristate "VOP Driver" - depends on VOP_BUS + depends on VOP_BUS && VHOST_DPN select VHOST_RING select VIRTIO help |