diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-10-04 17:45:22 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-10-04 17:48:38 +0200 |
| commit | 0cef13d883e4644b4cf9b521d3f3e45355e60566 (patch) | |
| tree | 197166268608914708d24c1ac34cb2a905e97dae | |
| parent | 463c43fcd97e493d8a17242f4f000c86fe642ed6 (diff) | |
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>
| -rw-r--r-- | Documentation/driver-api/media/drivers/zoran.rst (renamed from Documentation/driver-api/media/drivers/v4l-drivers/zoran.rst) | 0 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/staging/media/zoran/Kconfig | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/driver-api/media/drivers/v4l-drivers/zoran.rst b/Documentation/driver-api/media/drivers/zoran.rst index 83cbae9cedef..83cbae9cedef 100644 --- a/Documentation/driver-api/media/drivers/v4l-drivers/zoran.rst +++ b/Documentation/driver-api/media/drivers/zoran.rst diff --git a/MAINTAINERS b/MAINTAINERS index ba5eb1dff9c2..7a12633747c8 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 492507030276..7874842033ca 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. |