diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-21 09:13:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-23 08:04:21 -0300 |
| commit | 1bbcdae7f0937b186754b04f74c821cf82b00a37 (patch) | |
| tree | 5edfc94d23700e442053660496dc28935f143ead /Documentation/media | |
| parent | b7fd6630026786d8bcca54bb9f5d035da1e2547a (diff) | |
| download | blackbird-op-linux-1bbcdae7f0937b186754b04f74c821cf82b00a37.tar.gz blackbird-op-linux-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')
| -rw-r--r-- | Documentation/media/kapi/v4l2-async.rst | 4 | ||||
| -rw-r--r-- | Documentation/media/kapi/v4l2-core.rst | 1 | ||||
| -rw-r--r-- | Documentation/media/kapi/v4l2-subdev.rst | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/media/kapi/v4l2-async.rst b/Documentation/media/kapi/v4l2-async.rst deleted file mode 100644 index 372aa29fbf29..000000000000 --- a/Documentation/media/kapi/v4l2-async.rst +++ /dev/null @@ -1,4 +0,0 @@ -V4L2 Async kAPI -^^^^^^^^^^^^^^^ - -.. kernel-doc:: include/media/v4l2-async.h diff --git a/Documentation/media/kapi/v4l2-core.rst b/Documentation/media/kapi/v4l2-core.rst index 8c127ccdb0ae..fc623e9ca871 100644 --- a/Documentation/media/kapi/v4l2-core.rst +++ b/Documentation/media/kapi/v4l2-core.rst @@ -5,7 +5,6 @@ Video2Linux devices :maxdepth: 1 v4l2-framework - v4l2-async v4l2-controls v4l2-device v4l2-dv-timings 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 |
