summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2023-02-01 13:21:36 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2023-02-09 09:22:36 +0100
commit39d08ab979b7995d22dd6b3ce74d3179f02847a1 (patch)
treed0ab3d2b9ce69e8b7b7f9a3120b0f7a7858f3e19 /MAINTAINERS
parentmedia: Revert "media: av7110: move to staging/media/deprecated/saa7146" (diff)
downloadlinux-39d08ab979b7995d22dd6b3ce74d3179f02847a1.tar.xz
linux-39d08ab979b7995d22dd6b3ce74d3179f02847a1.zip
media: Revert "media: saa7146: deprecate hexium_gemini/orion, mxb and ttpci"
This reverts commit e33fdb5a02490059e2f48ced2c038c8a46c6476d. The saa7146-based devices are still in use, esp. for DVB. So move these drivers back to mainline. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b8a4b52db8ca..14dee6886c6b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18393,7 +18393,9 @@ M: Hans Verkuil <hverkuil@xs4all.nl>
L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
-F: drivers/staging/media/deprecated/saa7146/
+F: drivers/media/common/saa7146/
+F: drivers/media/pci/saa7146/
+F: include/media/drv-intf/saa7146*
SAFESETID SECURITY MODULE
M: Micah Morton <mortonm@chromium.org>