diff --git a/[refs] b/[refs] index 2d36c4a97d73..b2d98506917f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2669f1073958584295f71010e2d8a141da14a392 +refs/heads/master: 2e74598d7f4c6d1b34da84037d9a7f8b1c8e04ae diff --git a/trunk/include/uapi/linux/videodev2.h b/trunk/include/uapi/linux/videodev2.h index 57bfa59cda74..2fff7ff3e05b 100644 --- a/trunk/include/uapi/linux/videodev2.h +++ b/trunk/include/uapi/linux/videodev2.h @@ -737,7 +737,7 @@ struct v4l2_window { struct v4l2_captureparm { __u32 capability; /* Supported modes */ __u32 capturemode; /* Current mode */ - struct v4l2_fract timeperframe; /* Time per frame in .1us units */ + struct v4l2_fract timeperframe; /* Time per frame in seconds */ __u32 extendedmode; /* Driver-specific extensions */ __u32 readbuffers; /* # of buffers for read */ __u32 reserved[4];