[PATCH v2 22/22] media: docs: get rid of Documentation/media/

From: Mauro Carvalho Chehab
Date: Tue Mar 10 2020 - 09:44:50 EST


Now that everything got moved, we can get rid of the
old media directory.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
---
Documentation/driver-api/index.rst | 1 +
Documentation/index.rst | 1 -
Documentation/media/index.rst | 23 -----------------------
Documentation/userspace-api/index.rst | 1 +
4 files changed, 2 insertions(+), 24 deletions(-)
delete mode 100644 Documentation/media/index.rst

diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst
index 0ebe205efd0c..92c2570277ac 100644
--- a/Documentation/driver-api/index.rst
+++ b/Documentation/driver-api/index.rst
@@ -62,6 +62,7 @@ available subsections can be seen below.
pinctl
gpio/index
md/index
+ media/index
misc_devices
nfc/index
dmaengine/index
diff --git a/Documentation/index.rst b/Documentation/index.rst
index e99d0bd2589d..7139190f1c01 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -108,7 +108,6 @@ needed).
isdn/index
infiniband/index
leds/index
- media/index
netlabel/index
networking/index
pcmcia/index
diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
deleted file mode 100644
index e93fd88881af..000000000000
--- a/Documentation/media/index.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. SPDX-License-Identifier: GPL-2.0
-
-Linux Media Subsystem Documentation
-===================================
-
-.. only:: html
-
- .. class:: toc-title
-
- Table of Contents
-
-.. toctree::
- :maxdepth: 2
-
- ../userspace-api/media/index
- ../driver-api/media/index
-
-.. only:: html and subproject
-
- Indices
- =======
-
- * :ref:`genindex`
diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspace-api/index.rst
index e983488b48b1..69fc5167e648 100644
--- a/Documentation/userspace-api/index.rst
+++ b/Documentation/userspace-api/index.rst
@@ -22,6 +22,7 @@ place where this information is gathered.
spec_ctrl
accelerators/ocxl
ioctl/index
+ media/index

.. only:: subproject and html

--
2.24.1