diff options
| author | Corentin Labbe <clabbe@baylibre.com> | 2020-09-25 21:30:11 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-10-01 10:29:56 +0300 |
| commit | 61c3b19f7b9eb7c7838fd35f86566230fefd6550 (patch) | |
| tree | 39c6fd0fe0b4627ecb373d2cb0b259253e95cbbf /drivers/staging/media/Kconfig | |
| parent | 6ca3549d870724495f96debfd85e96fa19dd4009 (diff) | |
| download | linux-61c3b19f7b9eb7c7838fd35f86566230fefd6550.tar.xz | |
media: staging: media: Revert "media: zoran: remove deprecated driver"
This reverts commit 8dce4b265a5357731058f69645840dabc718c687.
The revert is slighly modified:
- Documentation/media/v4l-drivers/index.rst is ,ot restored since removed from tree
- drivers/staging/media/Makefile is not restored since the zoran driver
is not compilable yet.
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/Kconfig')
| -rw-r--r-- | drivers/staging/media/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 5d33d5d9881e..0f9d159a1477 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -38,6 +38,8 @@ source "drivers/staging/media/sunxi/Kconfig" source "drivers/staging/media/tegra-vde/Kconfig" +source "drivers/staging/media/zoran/Kconfig" + source "drivers/staging/media/tegra-video/Kconfig" source "drivers/staging/media/ipu3/Kconfig" |