diff --git a/[refs] b/[refs] index 76488d6dc771..1d386b992c50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6889d5ced744cb8a5a96d359e8c3bc4e62bdc36b +refs/heads/master: 9a70d980d038e27828db92cef235fabfb618c77d diff --git a/trunk/Documentation/DocBook/media/v4l/selections-common.xml b/trunk/Documentation/DocBook/media/v4l/selections-common.xml index b6618709ee7a..7502f784b8cc 100644 --- a/trunk/Documentation/DocBook/media/v4l/selections-common.xml +++ b/trunk/Documentation/DocBook/media/v4l/selections-common.xml @@ -148,7 +148,7 @@ V4L2_SEL_FLAG_KEEP_CONFIG (1 << 2) - The configuration should not be propagated to any + The configuration must not be propagated to any further processing steps. If this flag is not given, the configuration is propagated inside the subdevice to all further processing steps.