2 files changed, 5 insertions, 13 deletions

diff --git a/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml b/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml
index 16431813bebd..66e9a5257861 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml
@@ -98,8 +98,11 @@ the &v4l2-output; <structfield>modulator</structfield> field and the
             <entry>&v4l2-tuner-type;</entry>
             <entry><structfield>type</structfield></entry>
             <entry>The tuner type. This is the same value as in the
-&v4l2-tuner; <structfield>type</structfield> field. The field is not
-applicable to modulators, &ie; ignored by drivers.</entry>
+&v4l2-tuner; <structfield>type</structfield> field. The type must be set
+to <constant>V4L2_TUNER_RADIO</constant> for <filename>/dev/radioX</filename>
+device nodes, and to <constant>V4L2_TUNER_ANALOG_TV</constant>
+for all others. The field is not applicable to modulators, &ie; ignored
+by drivers.</entry>
           </row>
           <row>
             <entry>__u32</entry>
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index c4362ef3a793..fed5a34a727d 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -460,17 +460,6 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
 
-What:   For VIDIOC_S_FREQUENCY the type field must match the device node's type.
-        If not, return -EINVAL.
-When:   3.2
-Why:    It makes no sense to switch the tuner to radio mode by calling
-        VIDIOC_S_FREQUENCY on a video node, or to switch the tuner to tv mode by
-        calling VIDIOC_S_FREQUENCY on a radio node. This is the first step of a
-        move to more consistent handling of tv and radio tuners.
-Who:    Hans Verkuil <hans.verkuil@cisco.com>
-
-----------------------------
-
 What:   Opening a radio device node will no longer automatically switch the
         tuner mode from tv to radio.
 When:   3.3