diff --git a/[refs] b/[refs] index 5c7c83c83a35..94c217c12b92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e765c6e445da16527a04aa3931f21e5deb476d8 +refs/heads/master: 0827d0664dfa046dc9359c1a45f613d916431ed7 diff --git a/trunk/Documentation/DocBook/v4l/vidioc-querycap.xml b/trunk/Documentation/DocBook/v4l/vidioc-querycap.xml index 6ab7e25b31b6..d499da93a450 100644 --- a/trunk/Documentation/DocBook/v4l/vidioc-querycap.xml +++ b/trunk/Documentation/DocBook/v4l/vidioc-querycap.xml @@ -184,7 +184,7 @@ data. V4L2_CAP_RDS_CAPTURE 0x00000100 - The device supports the RDS interface. + The device supports the RDS capture interface. V4L2_CAP_VIDEO_OUTPUT_OVERLAY @@ -205,6 +205,11 @@ driver capabilities. The device supports the &VIDIOC-S-HW-FREQ-SEEK; ioctl for hardware frequency seeking. + + V4L2_CAP_RDS_OUTPUT + 0x00000800 + The device supports the RDS output interface. + V4L2_CAP_TUNER 0x00010000