summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-25 10:29:13 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-25 10:29:43 +0100
commit333a6515344f5dc4ed0772b8fe252a2246f2e099 (patch)
tree17d93325ab3178b65c5f5c98bb0a02e52f513c95 /Documentation/DocBook/media
parentMerge tag 'v4.5-rc1' into patchwork (diff)
downloadlinux-333a6515344f5dc4ed0772b8fe252a2246f2e099.tar.xz
linux-333a6515344f5dc4ed0772b8fe252a2246f2e099.zip
Revert "[media] Postpone the addition of MEDIA_IOC_G_TOPOLOGY"
Enable MEDIA_IOC_G_TOPOLOGY ioctl for Kernel 4.6. This reverts commit be0270ec89e6b9b49de7e533dd1f3a89ad34d205. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'Documentation/DocBook/media')
-rw-r--r--Documentation/DocBook/media/v4l/media-ioc-g-topology.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml b/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml
index 63152ab9efba..e0d49fa329f0 100644
--- a/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml
+++ b/Documentation/DocBook/media/v4l/media-ioc-g-topology.xml
@@ -48,9 +48,6 @@
<refsect1>
<title>Description</title>
-
- <para><emphasis role="bold">NOTE:</emphasis> This new ioctl is programmed to be added on Kernel 4.6. Its definition/arguments may change until its final version.</para>
-
<para>The typical usage of this ioctl is to call it twice.
On the first call, the structure defined at &media-v2-topology; should
be zeroed. At return, if no errors happen, this ioctl will return the