diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2019-11-11 06:23:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2019-11-11 06:23:37 +0100 |
| commit | f0cb9b5dfd1a6014349354e63768500a860cad53 (patch) | |
| tree | b18478292c622b7cfbc4f49dc52e1f3816ac1b99 /drivers/staging/Kconfig | |
| parent | staging: vchiq: Have vchiu_queue_init() return 0 on success. (diff) | |
| parent | Linux 5.4-rc7 (diff) | |
| download | linux-f0cb9b5dfd1a6014349354e63768500a860cad53.tar.gz linux-f0cb9b5dfd1a6014349354e63768500a860cad53.tar.bz2 linux-f0cb9b5dfd1a6014349354e63768500a860cad53.zip | |
Merge 5.4-rc7 into staging-next
We want the staging fixes in here, and it resolves some merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/Kconfig')
| -rw-r--r-- | drivers/staging/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index a490141a0e88..0f19b086865a 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -125,6 +125,8 @@ source "drivers/staging/exfat/Kconfig" source "drivers/staging/qlge/Kconfig" +source "drivers/staging/vboxsf/Kconfig" + source "drivers/staging/wfx/Kconfig" endif # STAGING |