diff --git a/[refs] b/[refs] index 0360f42c2c7b..62d21839b768 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 955f645aea04f3130d39c7889e2c5bd7f6d638a3 +refs/heads/master: 8766e86535c9c9d46621f285b85266b2975348c2 diff --git a/trunk/Documentation/DocBook/media/v4l/compat.xml b/trunk/Documentation/DocBook/media/v4l/compat.xml index 0fc74ca81f0f..87339b2aad78 100644 --- a/trunk/Documentation/DocBook/media/v4l/compat.xml +++ b/trunk/Documentation/DocBook/media/v4l/compat.xml @@ -2557,6 +2557,13 @@ interfaces and should not be implemented in new drivers. VIDIOC_S_MPEGCOMP ioctls. Use Extended Controls, . + + VIDIOC_SUBDEV_G_CROP and + VIDIOC_SUBDEV_S_CROP ioctls. Use + VIDIOC_SUBDEV_G_SELECTION and + VIDIOC_SUBDEV_S_SELECTION, . + diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml index 06197323a8cc..4cddd788c589 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-subdev-g-crop.xml @@ -58,9 +58,12 @@ Description - Experimental - This is an experimental - interface and may change in the future. + Obsolete + + This is an obsolete + interface and may be removed in the future. It is superseded by + the selection + API. To retrieve the current crop rectangle applications set the