diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-23 03:10:12 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-23 03:10:12 +0100 |
| commit | 94000cc32988a0674923309d35ab9c2405c4b39b (patch) | |
| tree | ef9d58ea9ad614bfdf6d0c7c6293f05dbd989475 /include/drm/drm_atomic.h | |
| parent | Merge tag 'drm-tinydrm-2017-02-18' of https://github.com/notro/linux into drm... (diff) | |
| parent | Linux 4.10-rc8 (diff) | |
| download | linux-94000cc32988a0674923309d35ab9c2405c4b39b.tar.xz linux-94000cc32988a0674923309d35ab9c2405c4b39b.zip | |
Merge tag 'v4.10-rc8' into drm-next
Linux 4.10-rc8
Backmerge Linus rc8 to fix some conflicts, but also
to avoid pulling it in via a fixes pull from someone.
Diffstat (limited to 'include/drm/drm_atomic.h')
| -rw-r--r-- | include/drm/drm_atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 2e28fdca9c3d..052ab161b239 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -145,7 +145,7 @@ struct __drm_crtcs_state { struct drm_crtc *ptr; struct drm_crtc_state *state; struct drm_crtc_commit *commit; - s64 __user *out_fence_ptr; + s32 __user *out_fence_ptr; unsigned last_vblank_count; }; |