summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-17 15:19:48 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-17 16:30:35 -0300
commitf6ebc2d341b57b233368ae8d6a0e4087e724cb10 (patch)
tree06ae15d63b7bd6c38fd5541d07e2e5bbec1fbcb1
parent92effdf8b8b214165d5437f02b0ccbe80ba244cf (diff)
[media] doc-rst: move framework docs to kAPI documentation
Those documentation are part of the kAPI one. Move to the right place. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--Documentation/media/kapi/v4l2-controls.rst (renamed from Documentation/video4linux/v4l2-controls.txt)0
-rw-r--r--Documentation/media/kapi/v4l2-framework.rst (renamed from Documentation/video4linux/v4l2-framework.txt)0
-rw-r--r--Documentation/media/media_drivers.rst2
3 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/video4linux/v4l2-controls.txt b/Documentation/media/kapi/v4l2-controls.rst
index 5e759cab4538..5e759cab4538 100644
--- a/Documentation/video4linux/v4l2-controls.txt
+++ b/Documentation/media/kapi/v4l2-controls.rst
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/media/kapi/v4l2-framework.rst
index cbefc7902f5f..cbefc7902f5f 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/media/kapi/v4l2-framework.rst
diff --git a/Documentation/media/media_drivers.rst b/Documentation/media/media_drivers.rst
index e2388f02d2b8..5941fea2607e 100644
--- a/Documentation/media/media_drivers.rst
+++ b/Documentation/media/media_drivers.rst
@@ -17,6 +17,8 @@ License".
.. toctree::
:maxdepth: 5
+ kapi/v4l2-framework
+ kapi/v4l2-controls
kapi/v4l2-core
kapi/dtv-core
kapi/rc-core