diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:30:11 +0100 |
| commit | 9a1f4150fe932fb892c05084029b3718b8ed1baf (patch) | |
| tree | b8f18ea5f0bdc842e3cf8da4700c1d577a3b1c66 /include/drm/drm_mode_config.h | |
| parent | f28442497b5caf7bf573ade22a7f8d3559e3ef56 (diff) | |
| parent | 1b1bc42c1692e9b62756323c675a44cb1a1f9dbd (diff) | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/drm/drm_mode_config.h')
| -rw-r--r-- | include/drm/drm_mode_config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index bf9991b20611..137432386310 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -488,7 +488,7 @@ struct drm_mode_config { /** * @prop_out_fence_ptr: Sync File fd pointer representing the * outgoing fences for a CRTC. Userspace should provide a pointer to a - * value of type s64, and then cast that pointer to u64. + * value of type s32, and then cast that pointer to u64. */ struct drm_property *prop_out_fence_ptr; /** |