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/kapi/v4l2-core.rst | |
parent | b7fd6630026786d8bcca54bb9f5d035da1e2547a (diff) | |
download | kernel_replicant_linux-1bbcdae7f0937b186754b04f74c821cf82b00a37.tar.gz kernel_replicant_linux-1bbcdae7f0937b186754b04f74c821cf82b00a37.tar.bz2 kernel_replicant_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/kapi/v4l2-core.rst')
-rw-r--r-- | Documentation/media/kapi/v4l2-core.rst | 1 |
1 files changed, 0 insertions, 1 deletions
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 |