aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/media/kapi/v4l2-subdev.rst
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-21 09:13:11 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-23 08:04:21 -0300
commit1bbcdae7f0937b186754b04f74c821cf82b00a37 (patch)
tree5edfc94d23700e442053660496dc28935f143ead /Documentation/media/kapi/v4l2-subdev.rst
parent[media] v4l2-subdev.rst: add cross-references (diff)
downloadlinux-dev-1bbcdae7f0937b186754b04f74c821cf82b00a37.tar.xz
linux-dev-1bbcdae7f0937b186754b04f74c821cf82b00a37.zip
[media] doc-rst: merge v4l2-async.rst with v4l2-subdev.rst
The Async API is actually part of the v4l2 subdev. Move its declarations to it. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/media/kapi/v4l2-subdev.rst')
-rw-r--r--Documentation/media/kapi/v4l2-subdev.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/media/kapi/v4l2-subdev.rst b/Documentation/media/kapi/v4l2-subdev.rst
index 101902c930b9..829016940597 100644
--- a/Documentation/media/kapi/v4l2-subdev.rst
+++ b/Documentation/media/kapi/v4l2-subdev.rst
@@ -266,3 +266,8 @@ V4L2 subdev kAPI
^^^^^^^^^^^^^^^^
.. kernel-doc:: include/media/v4l2-subdev.h
+
+V4L2 subdev async kAPI
+^^^^^^^^^^^^^^^^^^^^^^
+
+.. kernel-doc:: include/media/v4l2-async.h