diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-03-10 13:57:48 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-04-14 10:36:50 +0200 |
| commit | d29e1ef4d638a6be59a8859b4994b457bb7348c5 (patch) | |
| tree | 9dc423a57b307a64b97a811830af9d75ae004caa | |
| parent | media: docs: add an uAPI chapter for driver-specific stuff (diff) | |
| download | linux-d29e1ef4d638a6be59a8859b4994b457bb7348c5.tar.xz linux-d29e1ef4d638a6be59a8859b4994b457bb7348c5.zip | |
media: docs: get rid of Documentation/media/
Now that everything got moved, we can get rid of the
old media directory.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | Documentation/driver-api/index.rst | 1 | ||||
| -rw-r--r-- | Documentation/index.rst | 1 | ||||
| -rw-r--r-- | Documentation/media/.gitignore | 5 | ||||
| -rw-r--r-- | Documentation/media/index.rst | 23 | ||||
| -rw-r--r-- | Documentation/userspace-api/index.rst | 1 |
5 files changed, 2 insertions, 29 deletions
diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst index d4e78cb3ef4d..dcc47c029f8e 100644 --- a/Documentation/driver-api/index.rst +++ b/Documentation/driver-api/index.rst @@ -63,6 +63,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 9599c0f3eea8..af2b87afebc8 100644 --- a/Documentation/index.rst +++ b/Documentation/index.rst @@ -109,7 +109,6 @@ needed). isdn/index infiniband/index leds/index - media/index netlabel/index networking/index pcmcia/index diff --git a/Documentation/media/.gitignore b/Documentation/media/.gitignore deleted file mode 100644 index 53adc029061f..000000000000 --- a/Documentation/media/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -*.pdf -# Files generated from *.dot -uapi/v4l/pipeline.svg 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 |