summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/driver-api/media/drivers/bttv-devel.rst (renamed from Documentation/media/v4l-drivers/bttv-devel.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/contributors.rst (renamed from Documentation/media/dvb-drivers/contributors.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/cpia2_devel.rst (renamed from Documentation/media/v4l-drivers/cpia2_devel.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/cx2341x-devel.rst (renamed from Documentation/media/v4l-drivers/cx2341x-devel.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/cx88-devel.rst (renamed from Documentation/media/v4l-drivers/cx88-devel.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst (renamed from Documentation/media/v4l-drivers/davinci-vpbe-devel.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/dvb-usb.rst (renamed from Documentation/media/dvb-drivers/dvb-usb.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/fimc-devel.rst (renamed from Documentation/media/v4l-drivers/fimc-devel.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/frontends.rst (renamed from Documentation/media/dvb-drivers/frontends.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/index.rst (renamed from Documentation/media/dvb-drivers/index.rst)29
-rw-r--r--Documentation/driver-api/media/drivers/pvrusb2.rst (renamed from Documentation/media/v4l-drivers/pvrusb2.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/pxa_camera.rst (renamed from Documentation/media/v4l-drivers/pxa_camera.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/radiotrack.rst (renamed from Documentation/media/v4l-drivers/radiotrack.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/saa7134-devel.rst (renamed from Documentation/media/v4l-drivers/saa7134-devel.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/sh_mobile_ceu_camera.rst (renamed from Documentation/media/v4l-drivers/sh_mobile_ceu_camera.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/tuners.rst (renamed from Documentation/media/v4l-drivers/tuners.rst)0
-rw-r--r--Documentation/driver-api/media/drivers/vimc-devel.rst (renamed from Documentation/media/v4l-drivers/vimc-devel.rst)0
-rw-r--r--Documentation/driver-api/media/index.rst2
-rw-r--r--Documentation/media/index.rst1
-rw-r--r--Documentation/media/v4l-drivers/index.rst14
20 files changed, 30 insertions, 16 deletions
diff --git a/Documentation/media/v4l-drivers/bttv-devel.rst b/Documentation/driver-api/media/drivers/bttv-devel.rst
index 396fad572c93..396fad572c93 100644
--- a/Documentation/media/v4l-drivers/bttv-devel.rst
+++ b/Documentation/driver-api/media/drivers/bttv-devel.rst
diff --git a/Documentation/media/dvb-drivers/contributors.rst b/Documentation/driver-api/media/drivers/contributors.rst
index f23b6e6faf46..f23b6e6faf46 100644
--- a/Documentation/media/dvb-drivers/contributors.rst
+++ b/Documentation/driver-api/media/drivers/contributors.rst
diff --git a/Documentation/media/v4l-drivers/cpia2_devel.rst b/Documentation/driver-api/media/drivers/cpia2_devel.rst
index decaa4768c78..decaa4768c78 100644
--- a/Documentation/media/v4l-drivers/cpia2_devel.rst
+++ b/Documentation/driver-api/media/drivers/cpia2_devel.rst
diff --git a/Documentation/media/v4l-drivers/cx2341x-devel.rst b/Documentation/driver-api/media/drivers/cx2341x-devel.rst
index 97699df6ea2e..97699df6ea2e 100644
--- a/Documentation/media/v4l-drivers/cx2341x-devel.rst
+++ b/Documentation/driver-api/media/drivers/cx2341x-devel.rst
diff --git a/Documentation/media/v4l-drivers/cx88-devel.rst b/Documentation/driver-api/media/drivers/cx88-devel.rst
index cfe7c03f4930..cfe7c03f4930 100644
--- a/Documentation/media/v4l-drivers/cx88-devel.rst
+++ b/Documentation/driver-api/media/drivers/cx88-devel.rst
diff --git a/Documentation/media/v4l-drivers/davinci-vpbe-devel.rst b/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst
index f0961672e6a3..f0961672e6a3 100644
--- a/Documentation/media/v4l-drivers/davinci-vpbe-devel.rst
+++ b/Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst
diff --git a/Documentation/media/dvb-drivers/dvb-usb.rst b/Documentation/driver-api/media/drivers/dvb-usb.rst
index b2d5d9e62b30..b2d5d9e62b30 100644
--- a/Documentation/media/dvb-drivers/dvb-usb.rst
+++ b/Documentation/driver-api/media/drivers/dvb-usb.rst
diff --git a/Documentation/media/v4l-drivers/fimc-devel.rst b/Documentation/driver-api/media/drivers/fimc-devel.rst
index 956e3a9901f8..956e3a9901f8 100644
--- a/Documentation/media/v4l-drivers/fimc-devel.rst
+++ b/Documentation/driver-api/media/drivers/fimc-devel.rst
diff --git a/Documentation/media/dvb-drivers/frontends.rst b/Documentation/driver-api/media/drivers/frontends.rst
index 7b8336ece681..7b8336ece681 100644
--- a/Documentation/media/dvb-drivers/frontends.rst
+++ b/Documentation/driver-api/media/drivers/frontends.rst
diff --git a/Documentation/media/dvb-drivers/index.rst b/Documentation/driver-api/media/drivers/index.rst
index 7a870ee7ac7d..aafff51f7e0e 100644
--- a/Documentation/media/dvb-drivers/index.rst
+++ b/Documentation/driver-api/media/drivers/index.rst
@@ -2,6 +2,34 @@
.. include:: <isonum.txt>
+################################################
+Video4Linux (V4L) driver-specific documentation
+################################################
+
+.. only:: html
+
+ .. class:: toc-title
+
+ Table of Contents
+
+.. toctree::
+ :maxdepth: 5
+
+ bttv-devel
+ cpia2_devel
+ cx2341x-devel
+ cx88-devel
+ davinci-vpbe-devel
+ fimc-devel
+ pvrusb2
+ pxa_camera
+ radiotrack
+ saa7134-devel
+ sh_mobile_ceu_camera
+ tuners
+ vimc-devel
+
+
##############################################
Linux Digital TV driver-specific documentation
##############################################
@@ -27,7 +55,6 @@ For more details see the file COPYING in the source distribution of Linux.
.. toctree::
:maxdepth: 5
- :numbered:
dvb-usb
frontends
diff --git a/Documentation/media/v4l-drivers/pvrusb2.rst b/Documentation/driver-api/media/drivers/pvrusb2.rst
index 83bfaa531ea8..83bfaa531ea8 100644
--- a/Documentation/media/v4l-drivers/pvrusb2.rst
+++ b/Documentation/driver-api/media/drivers/pvrusb2.rst
diff --git a/Documentation/media/v4l-drivers/pxa_camera.rst b/Documentation/driver-api/media/drivers/pxa_camera.rst
index ee1bd96b66dd..ee1bd96b66dd 100644
--- a/Documentation/media/v4l-drivers/pxa_camera.rst
+++ b/Documentation/driver-api/media/drivers/pxa_camera.rst
diff --git a/Documentation/media/v4l-drivers/radiotrack.rst b/Documentation/driver-api/media/drivers/radiotrack.rst
index a85cb6205db8..a85cb6205db8 100644
--- a/Documentation/media/v4l-drivers/radiotrack.rst
+++ b/Documentation/driver-api/media/drivers/radiotrack.rst
diff --git a/Documentation/media/v4l-drivers/saa7134-devel.rst b/Documentation/driver-api/media/drivers/saa7134-devel.rst
index 167fd729bc8c..167fd729bc8c 100644
--- a/Documentation/media/v4l-drivers/saa7134-devel.rst
+++ b/Documentation/driver-api/media/drivers/saa7134-devel.rst
diff --git a/Documentation/media/v4l-drivers/sh_mobile_ceu_camera.rst b/Documentation/driver-api/media/drivers/sh_mobile_ceu_camera.rst
index 822fcb8368ae..822fcb8368ae 100644
--- a/Documentation/media/v4l-drivers/sh_mobile_ceu_camera.rst
+++ b/Documentation/driver-api/media/drivers/sh_mobile_ceu_camera.rst
diff --git a/Documentation/media/v4l-drivers/tuners.rst b/Documentation/driver-api/media/drivers/tuners.rst
index 7509be888909..7509be888909 100644
--- a/Documentation/media/v4l-drivers/tuners.rst
+++ b/Documentation/driver-api/media/drivers/tuners.rst
diff --git a/Documentation/media/v4l-drivers/vimc-devel.rst b/Documentation/driver-api/media/drivers/vimc-devel.rst
index b2aa2ee79205..b2aa2ee79205 100644
--- a/Documentation/media/v4l-drivers/vimc-devel.rst
+++ b/Documentation/driver-api/media/drivers/vimc-devel.rst
diff --git a/Documentation/driver-api/media/index.rst b/Documentation/driver-api/media/index.rst
index d2842f300bbd..57383df79bd3 100644
--- a/Documentation/driver-api/media/index.rst
+++ b/Documentation/driver-api/media/index.rst
@@ -36,3 +36,5 @@ For more details see the file COPYING in the source distribution of Linux.
mc-core
cec-core
csi2
+
+ drivers/index
diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
index 0f75280b8c43..a5cd600e0b04 100644
--- a/Documentation/media/index.rst
+++ b/Documentation/media/index.rst
@@ -16,7 +16,6 @@ Linux Media Subsystem Documentation
../driver-api/media/index
v4l-drivers/index
- dvb-drivers/index
.. only:: html and subproject
diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst
index aef375cfb05a..ee7faff88a33 100644
--- a/Documentation/media/v4l-drivers/index.rst
+++ b/Documentation/media/v4l-drivers/index.rst
@@ -31,23 +31,9 @@ For more details see the file COPYING in the source distribution of Linux.
:maxdepth: 5
:numbered:
- tuners
max2175
- pvrusb2
- pxa_camera
- radiotrack
- sh_mobile_ceu_camera
uvcvideo
- bttv-devel
- cpia2_devel
- cx2341x-devel
- cx88-devel
- davinci-vpbe-devel
- fimc-devel
- saa7134-devel
- vimc-devel
-
cx2341x-uapi
imx-uapi
meye-uapi