diff --git a/Documentation/driver-api/media/drivers/vimc-devel.rst b/Documentation/driver-api/media/drivers/vimc-devel.rst
index b2aa2ee79205f7da727435822f651753b4f2ce0d..1584abba6ee01e008c0f8fb97301a80e9b53e49b 100644
--- a/Documentation/driver-api/media/drivers/vimc-devel.rst
+++ b/Documentation/driver-api/media/drivers/vimc-devel.rst
@@ -9,7 +9,7 @@ Source code documentation
 vimc-streamer
 ~~~~~~~~~~~~~
 
-.. kernel-doc:: drivers/media/platform/vimc/vimc-streamer.h
+.. kernel-doc:: drivers/media/test_drivers/vimc/vimc-streamer.h
    :internal:
 
-.. kernel-doc:: drivers/media/platform/vimc/vimc-streamer.c
+.. kernel-doc:: drivers/media/test_drivers/vimc/vimc-streamer.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 0cfd86594b0b1b066e9e6198d03669e756ce2ebf..db9937643a6cceb372c7131394e92d3c7f0f4083 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5125,7 +5125,7 @@ X:	Documentation/ABI/
 X:	Documentation/devicetree/
 X:	Documentation/firmware-guide/acpi/
 X:	Documentation/i2c/
-X:	Documentation/media/
+X:	Documentation/admin-guide/media/
 X:	Documentation/userspace-api/media/
 X:	Documentation/driver-api/media/
 X:	Documentation/power/
@@ -10609,7 +10609,7 @@ W:	https://linuxtv.org
 Q:	http://patchwork.kernel.org/project/linux-media/list/
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/
-F:	Documentation/media/
+X:	Documentation/admin-guide/media/
 F:	Documentation/userspace-api/media/
 F:	Documentation/driver-api/media/
 F:	drivers/media/