소스 검색

[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>
Mauro Carvalho Chehab 9 년 전
부모
커밋
1bbcdae7f0
3개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 4
      Documentation/media/kapi/v4l2-async.rst
  2. 0 1
      Documentation/media/kapi/v4l2-core.rst
  3. 5 0
      Documentation/media/kapi/v4l2-subdev.rst

+ 0 - 4
Documentation/media/kapi/v4l2-async.rst

@@ -1,4 +0,0 @@
-V4L2 Async kAPI
-^^^^^^^^^^^^^^^
-
-.. kernel-doc:: include/media/v4l2-async.h

+ 0 - 1
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

+ 5 - 0
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