diff --git a/Documentation/linux_tv/media/v4l/common.rst b/Documentation/linux_tv/media/v4l/common.rst index 0e85b46b2efc8d8f343d123c37b4275d3831b738..40d3feab5ab9907a208aefb197b83ecf4debf7b6 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 fe5bca543699cbf062a79d2ce09f0dd4b6b0e87d..0000000000000000000000000000000000000000 --- 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 -.. ------------------------------------------------------------------------------