diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:03:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:03:05 +0100 |
| commit | 24cd719712aeb5b5e4562f37ef5f7ba33040b59f (patch) | |
| tree | 689077bc9bf2e9f8b7df1c6a37dcefe8045912d7 /drivers/staging/Kconfig | |
| parent | 84c365f8ff8fc93a34d6cabe780d0b0f49c177e2 (diff) | |
| parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
Merge 5.16-rc3 into staging-next
We need the staging driver fixes in here as well.
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, 0 insertions, 2 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 893af6f05e06..8d41fdd40657 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -66,8 +66,6 @@ source "drivers/staging/gdm724x/Kconfig" source "drivers/staging/fwserial/Kconfig" -source "drivers/staging/netlogic/Kconfig" - source "drivers/staging/gs_fpgaboot/Kconfig" source "drivers/staging/unisys/Kconfig" |