diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-02 08:37:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-07-03 10:05:13 -0300 |
| commit | 09e6b3267ab6d0393545a733003dca0db1a4e1fd (patch) | |
| tree | 26a63f99bb7edcd7014a54e277a61e88d9618e57 | |
| parent | f243762fed05a37bbc6b14e03ebbdf0b59d39ed9 (diff) | |
doc-rst: linux_tv: remove controls
This auto-generated file is bogus: it just adds a toc for two
other files. Instead, just move the controls and extended-controls
directly to the common file.
this avoids a blank page, and better organize the document.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | Documentation/linux_tv/media/v4l/common.rst | 3 | ||||
| -rw-r--r-- | Documentation/linux_tv/media/v4l/controls.rst | 18 |
2 files changed, 2 insertions, 19 deletions
diff --git a/Documentation/linux_tv/media/v4l/common.rst b/Documentation/linux_tv/media/v4l/common.rst index 0e85b46b2efc..40d3feab5ab9 100644 --- a/Documentation/linux_tv/media/v4l/common.rst +++ b/Documentation/linux_tv/media/v4l/common.rst @@ -37,7 +37,8 @@ applicable to all devices. tuner standard dv-timings - controls + control + extended-controls format planar-apis crop diff --git a/Documentation/linux_tv/media/v4l/controls.rst b/Documentation/linux_tv/media/v4l/controls.rst deleted file mode 100644 index fe5bca543699..000000000000 --- a/Documentation/linux_tv/media/v4l/controls.rst +++ /dev/null @@ -1,18 +0,0 @@ -.. -*- coding: utf-8; mode: rst -*- - -.. toctree:: - :maxdepth: 1 - - control - extended-controls - - - - -.. ------------------------------------------------------------------------------ -.. This file was automatically converted from DocBook-XML with the dbxml -.. library (https://github.com/return42/sphkerneldoc). The origin XML comes -.. from the linux kernel, refer to: -.. -.. * https://github.com/torvalds/linux/tree/master/Documentation/DocBook -.. ------------------------------------------------------------------------------ |