summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-03-14 08:57:06 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:58:51 +0900
commit1fda24ed2b5b60deb99411352a84fa3803c7b997 (patch)
tree384ccc220631eab07a5abd4de8e79ccd8d6d6704 /Documentation
parenteae2ec760bd192fa3a6626917a97285bd4dece15 (diff)
downloadlinux-3.10-1fda24ed2b5b60deb99411352a84fa3803c7b997.tar.gz
linux-3.10-1fda24ed2b5b60deb99411352a84fa3803c7b997.tar.bz2
linux-3.10-1fda24ed2b5b60deb99411352a84fa3803c7b997.zip
upstream: [media] DocBook media: v4l2_format_sdr was renamed to v4l2_sdr_format
Update the DocBook files accordingly. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Cc: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/media/v4l/dev-sdr.xml6
-rw-r--r--Documentation/DocBook/media/v4l/vidioc-g-fmt.xml2
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/DocBook/media/v4l/dev-sdr.xml b/Documentation/DocBook/media/v4l/dev-sdr.xml
index a26bd3bc5d7..ce2c62b1ec3 100644
--- a/Documentation/DocBook/media/v4l/dev-sdr.xml
+++ b/Documentation/DocBook/media/v4l/dev-sdr.xml
@@ -63,15 +63,15 @@ must be supported as well.
<para>
To use the <link linkend="format">format</link> ioctls applications set the
<structfield>type</structfield> field of a &v4l2-format; to
-<constant>V4L2_BUF_TYPE_SDR_CAPTURE</constant> and use the &v4l2-format-sdr;
+<constant>V4L2_BUF_TYPE_SDR_CAPTURE</constant> and use the &v4l2-sdr-format;
<structfield>sdr</structfield> member of the <structfield>fmt</structfield>
union as needed per the desired operation.
Currently only the <structfield>pixelformat</structfield> field of
-&v4l2-format-sdr; is used. The content of that field is the V4L2 fourcc code
+&v4l2-sdr-format; is used. The content of that field is the V4L2 fourcc code
of the data format.
</para>
- <table pgwide="1" frame="none" id="v4l2-format-sdr">
+ <table pgwide="1" frame="none" id="v4l2-sdr-format">
<title>struct <structname>v4l2_sdr_format</structname></title>
<tgroup cols="3">
&cs-str;
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-fmt.xml b/Documentation/DocBook/media/v4l/vidioc-g-fmt.xml
index f43f1a9285d..4fe19a7a9a3 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-fmt.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-fmt.xml
@@ -172,7 +172,7 @@ capture and output devices.</entry>
</row>
<row>
<entry></entry>
- <entry>&v4l2-format-sdr;</entry>
+ <entry>&v4l2-sdr-format;</entry>
<entry><structfield>sdr</structfield></entry>
<entry>Definition of a data format, see
<xref linkend="pixfmt" />, used by SDR capture devices.</entry>