diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 20:43:40 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-10-23 20:43:40 +0200 |
| commit | 91de76e661a266731fc2889a398ad1694df9d523 (patch) | |
| tree | ecc278f000f18e5b2b880f61ee4b0e68ebd1d6d4 /Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst | |
| parent | Input: edt-ft5x06 - implement support for the EDT-M12 series (diff) | |
| parent | Linux 4.14-rc6 (diff) | |
| download | linux-91de76e661a266731fc2889a398ad1694df9d523.tar.xz linux-91de76e661a266731fc2889a398ad1694df9d523.zip | |
Merge tag 'v4.14-rc6' into next
Merge with mainline to bring in the timer API changes.
Diffstat (limited to 'Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst')
| -rw-r--r-- | Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst index 0d16853b1b51..6c82eafd28bb 100644 --- a/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst +++ b/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst @@ -29,6 +29,7 @@ Arguments File descriptor returned by :ref:`open() <func-open>`. ``argp`` + Pointer to struct :c:type:`v4l2_dv_timings`. Description |