diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-24 14:15:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-24 14:15:58 +1100 |
| commit | c2ecc4f9ee1b4a30eb97b8aacde6b4eb9482ae38 (patch) | |
| tree | 6c1b1576ef043ecf82c07062a287c5788a8f03de /include/media/v4l2-ctrls.h | |
| parent | d59b405e2f21546455ca9d54303603e9af834a06 (diff) | |
| parent | 1971011670b70fd95fd243bed5befa2edb330320 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'include/media/v4l2-ctrls.h')
| -rw-r--r-- | include/media/v4l2-ctrls.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index e1006b391cdc..bee1404391dd 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -174,10 +174,10 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv); * not freed when the control is deleted. Should this be needed * then a new internal bitfield can be added to tell the framework * to free this pointer. - * @p_cur: The control's current value represented via an union with + * @p_cur: The control's current value represented via a union with * provides a standard way of accessing control types * through a pointer. - * @p_new: The control's new value represented via an union with provides + * @p_new: The control's new value represented via a union with provides * a standard way of accessing control types * through a pointer. */ |