1 files changed, 0 insertions, 14 deletions
diff --git a/Documentation/DocBook/media/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml
index ae06afbbb3a9..1ddf354aa997 100644
--- a/Documentation/DocBook/media/v4l/common.xml
+++ b/Documentation/DocBook/media/v4l/common.xml
@@ -750,15 +750,6 @@ header can be used to get the timings of the formats in the <xref linkend="cea86
 <xref linkend="vesadmt" /> standards.
        </para>
        </listitem>
-        <listitem>
-        <para>DV Presets: Digital Video (DV) presets (<emphasis role="bold">deprecated</emphasis>).
-        These are IDs representing a
-video timing at the input/output. Presets are pre-defined timings implemented
-by the hardware according to video standards. A __u32 data type is used to represent
-a preset unlike the bit mask that is used in &v4l2-std-id; allowing future extensions
-to support as many different presets as needed. This API is deprecated in favor of the DV Timings
-API.</para>
-        </listitem>
        </itemizedlist>
        <para>To enumerate and query the attributes of the DV timings supported by a device,
        applications use the &VIDIOC-ENUM-DV-TIMINGS; and &VIDIOC-DV-TIMINGS-CAP; ioctls.
@@ -766,11 +757,6 @@ API.</para>
 &VIDIOC-S-DV-TIMINGS; ioctl and to get current DV timings they use the
 &VIDIOC-G-DV-TIMINGS; ioctl. To detect the DV timings as seen by the video receiver applications
 use the &VIDIOC-QUERY-DV-TIMINGS; ioctl.</para>
-        <para>To enumerate and query the attributes of DV presets supported by a device,
-applications use the &VIDIOC-ENUM-DV-PRESETS; ioctl. To get the current DV preset,
-applications use the &VIDIOC-G-DV-PRESET; ioctl and to set a preset they use the
-&VIDIOC-S-DV-PRESET; ioctl. To detect the preset as seen by the video receiver applications
-use the &VIDIOC-QUERY-DV-PRESET; ioctl.</para>
        <para>Applications can make use of the <xref linkend="input-capabilities" /> and
 <xref linkend="output-capabilities"/> flags to decide what ioctls are available to set the
 video timings for the device.</para>

diff --git a/Documentation/DocBook/media/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml index ae06afbbb3a9..1ddf354aa997 100644 --- a/Documentation/DocBook/media/v4l/common.xml +++ b/Documentation/DocBook/media/v4l/common.xml
@@ -750,15 +750,6 @@ header can be used to get the timings of the formats in the <xref linkend="cea86
750	<xref linkend="vesadmt" /> standards.	750	<xref linkend="vesadmt" /> standards.
751	</para>	751	</para>
752	</listitem>	752	</listitem>
753	<listitem>
754	<para>DV Presets: Digital Video (DV) presets (<emphasis role="bold">deprecated</emphasis>).
755	These are IDs representing a
756	video timing at the input/output. Presets are pre-defined timings implemented
757	by the hardware according to video standards. A __u32 data type is used to represent
758	a preset unlike the bit mask that is used in &v4l2-std-id; allowing future extensions
759	to support as many different presets as needed. This API is deprecated in favor of the DV Timings
760	API.</para>
761	</listitem>
762	</itemizedlist>	753	</itemizedlist>
763	<para>To enumerate and query the attributes of the DV timings supported by a device,	754	<para>To enumerate and query the attributes of the DV timings supported by a device,
764	applications use the &VIDIOC-ENUM-DV-TIMINGS; and &VIDIOC-DV-TIMINGS-CAP; ioctls.	755	applications use the &VIDIOC-ENUM-DV-TIMINGS; and &VIDIOC-DV-TIMINGS-CAP; ioctls.
@@ -766,11 +757,6 @@ API.</para>
766	&VIDIOC-S-DV-TIMINGS; ioctl and to get current DV timings they use the	757	&VIDIOC-S-DV-TIMINGS; ioctl and to get current DV timings they use the
767	&VIDIOC-G-DV-TIMINGS; ioctl. To detect the DV timings as seen by the video receiver applications	758	&VIDIOC-G-DV-TIMINGS; ioctl. To detect the DV timings as seen by the video receiver applications
768	use the &VIDIOC-QUERY-DV-TIMINGS; ioctl.</para>	759	use the &VIDIOC-QUERY-DV-TIMINGS; ioctl.</para>
769	<para>To enumerate and query the attributes of DV presets supported by a device,
770	applications use the &VIDIOC-ENUM-DV-PRESETS; ioctl. To get the current DV preset,
771	applications use the &VIDIOC-G-DV-PRESET; ioctl and to set a preset they use the
772	&VIDIOC-S-DV-PRESET; ioctl. To detect the preset as seen by the video receiver applications
773	use the &VIDIOC-QUERY-DV-PRESET; ioctl.</para>
774	<para>Applications can make use of the <xref linkend="input-capabilities" /> and	760	<para>Applications can make use of the <xref linkend="input-capabilities" /> and
775	<xref linkend="output-capabilities"/> flags to decide what ioctls are available to set the	761	<xref linkend="output-capabilities"/> flags to decide what ioctls are available to set the
776	video timings for the device.</para>	762	video timings for the device.</para>