Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bbcdae7 authored Jul 21, 2016 by Mauro Carvalho Chehab

[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>

parent b7fd6630

Documentation/media/kapi/v4l2-async.rst

deleted100644 → 0

+0 −4

Original line number	Original line	Diff line number	Diff line
	V4L2 Async kAPI
	^^^^^^^^^^^^^^^

	.. kernel-doc:: include/media/v4l2-async.h

Documentation/media/kapi/v4l2-core.rst

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,6 @@ Video2Linux devices
	:maxdepth: 1		:maxdepth: 1

	v4l2-framework		v4l2-framework
	v4l2-async
	v4l2-controls		v4l2-controls
	v4l2-device		v4l2-device
	v4l2-dv-timings		v4l2-dv-timings

Documentation/media/kapi/v4l2-subdev.rst

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -266,3 +266,8 @@ V4L2 subdev kAPI
	^^^^^^^^^^^^^^^^		^^^^^^^^^^^^^^^^

	.. kernel-doc:: include/media/v4l2-subdev.h		.. kernel-doc:: include/media/v4l2-subdev.h

			V4L2 subdev async kAPI
			^^^^^^^^^^^^^^^^^^^^^^

			.. kernel-doc:: include/media/v4l2-async.h