From patchwork Mon Jul 4 11:46:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 9212329 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EB3DE60572 for ; Mon, 4 Jul 2016 11:48:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD52B286DE for ; Mon, 4 Jul 2016 11:48:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1FC4286E2; Mon, 4 Jul 2016 11:48:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C0CB286DF for ; Mon, 4 Jul 2016 11:48:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753526AbcGDLsI (ORCPT ); Mon, 4 Jul 2016 07:48:08 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:44963 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753612AbcGDLr1 (ORCPT ); Mon, 4 Jul 2016 07:47:27 -0400 Received: from 201.86.133.99.dynamic.adsl.gvt.net.br ([201.86.133.99] helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.85_2 #1 (Red Hat Linux)) id 1bK2LW-0005Je-Fr; Mon, 04 Jul 2016 11:47:26 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.87) (envelope-from ) id 1bK2LL-0007k8-8b; Mon, 04 Jul 2016 08:47:15 -0300 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab , Jonathan Corbet , Markus Heiser , linux-doc@vger.kernel.org Subject: [PATCH 17/51] Documentation: linux_tv: remove controls.rst Date: Mon, 4 Jul 2016 08:46:38 -0300 Message-Id: <9900ae2869fcd6da6d69ff0082009ab8f7f714ae.1467629489.git.mchehab@s-opensource.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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.rst file. this avoids a blank page, and better organize the document. Signed-off-by: Mauro Carvalho Chehab --- Documentation/linux_tv/media/v4l/common.rst | 3 ++- Documentation/linux_tv/media/v4l/controls.rst | 18 ------------------ 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 Documentation/linux_tv/media/v4l/controls.rst 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 -.. ------------------------------------------------------------------------------