From: Mauro Carvalho Chehab Date: Sat, 2 Jul 2016 11:37:16 +0000 (-0300) Subject: doc-rst: linux_tv: remove controls X-Git-Tag: v4.8-rc1~131^2^2~308 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=09e6b3267ab6d0393545a733003dca0db1a4e1fd;p=karo-tx-linux.git 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 --- 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 -.. ------------------------------------------------------------------------------