summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-05 12:32:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-05 12:32:34 -0800
commitee8f3955c0ef4c7a90a5f707c37c4cb3711ff626 (patch)
treeecd1f7ba6771f9b7be9e0fddd37a621bf9988145 /Documentation
parenta7c9b603cf2371edacb054abc35597e810c1e5fd (diff)
parentfbe093ac9f0201939279cdfe8b0fce20ce5ef7a9 (diff)
downloadlinux-stable-ee8f3955c0ef4c7a90a5f707c37c4cb3711ff626.tar.gz
linux-stable-ee8f3955c0ef4c7a90a5f707c37c4cb3711ff626.tar.bz2
linux-stable-ee8f3955c0ef4c7a90a5f707c37c4cb3711ff626.zip
Merge tag 'media/v4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: - some last time changes before we stablize the new entity function integer numbers at uAPI - probe: fix erroneous return value on i2c/adp1653 driver - fix tx 5v detect regression on adv7604 driver - fix missing unlock on error in vpfe_prepare_pipeline() on davinci_vpfe driver * tag 'media/v4.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] media: Sanitise the reserved fields of the G_TOPOLOGY IOCTL arguments [media] media.h: postpone connectors entities [media] media.h: use hex values for range offsets, move connectors base up. [media] adv7604: fix tx 5v detect regression [media] media.h: get rid of MEDIA_ENT_F_CONN_TEST [media] [for,v4.5] media.h: increase the spacing between function ranges [media] media: i2c/adp1653: probe: fix erroneous return value [media] media: davinci_vpfe: fix missing unlock on error in vpfe_prepare_pipeline()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/media/v4l/media-types.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/DocBook/media/v4l/media-types.xml b/Documentation/DocBook/media/v4l/media-types.xml
index 1af384250910..0ee0f3386cdf 100644
--- a/Documentation/DocBook/media/v4l/media-types.xml
+++ b/Documentation/DocBook/media/v4l/media-types.xml
@@ -57,10 +57,6 @@
<entry>Connector for a RGB composite signal.</entry>
</row>
<row>
- <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>
- <entry>Connector for a test generator.</entry>
- </row>
- <row>
<entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>
<entry>Camera video sensor entity.</entry>
</row>