From 0cef13d883e4644b4cf9b521d3f3e45355e60566 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Date: Sun, 4 Oct 2020 17:45:22 +0200 Subject: [PATCH] media: zoran.rst: place it at the right place this time I was too quick moving zoran.rst... it ends that the original patch didn't do the right thing and forgot to update the files that references it. Fix it. Fixes: 6b90346919d4 ("media: zoran: move documentation file to the right place") Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- .../driver-api/media/drivers/{v4l-drivers => }/zoran.rst | 0 MAINTAINERS | 2 +- drivers/staging/media/zoran/Kconfig | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename Documentation/driver-api/media/drivers/{v4l-drivers => }/zoran.rst (100%) diff --git a/Documentation/driver-api/media/drivers/v4l-drivers/zoran.rst b/Documentation/driver-api/media/drivers/zoran.rst similarity index 100% rename from Documentation/driver-api/media/drivers/v4l-drivers/zoran.rst rename to Documentation/driver-api/media/drivers/zoran.rst diff --git a/MAINTAINERS b/MAINTAINERS index ba5eb1dff9c23..7a12633747c80 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19247,7 +19247,7 @@ L: linux-media@vger.kernel.org S: Maintained W: http://mjpeg.sourceforge.net/driver-zoran/ Q: https://patchwork.linuxtv.org/project/linux-media/list/ -F: Documentation/media/v4l-drivers/zoran.rst +F: Documentation/driver-api/media/drivers/zoran.rst F: drivers/staging/media/zoran/ ZPOOL COMPRESSED PAGE STORAGE API diff --git a/drivers/staging/media/zoran/Kconfig b/drivers/staging/media/zoran/Kconfig index 4925070302769..7874842033ca1 100644 --- a/drivers/staging/media/zoran/Kconfig +++ b/drivers/staging/media/zoran/Kconfig @@ -8,7 +8,7 @@ config VIDEO_ZORAN 36057/36067 PCI controller chipset. This includes the Iomega Buz, Pinnacle DC10+ and the Linux Media Labs LML33. There is a driver homepage at <http://mjpeg.sf.net/driver-zoran/>. For - more information, check <file:Documentation/media/v4l-drivers/zoran.rst>. + more information, check <file:Documentation/driver-api/media/drivers/zoran.rst>. To compile this driver as a module, choose M here: the module will be called zr36067. -- GitLab