diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-17 06:13:53 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 06:13:53 +0200 |
| commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
| tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /drivers/gpu/drm/drm_irq.c | |
| parent | Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/... (diff) | |
| parent | Linux 4.2-rc7 (diff) | |
| download | linux-4eebf60b7452fbd551fd7dece855ba7825a49cbc.tar.xz linux-4eebf60b7452fbd551fd7dece855ba7825a49cbc.zip | |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 05b939e8da41..22d207e211e7 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -75,7 +75,7 @@ module_param_named(timestamp_precision_usec, drm_timestamp_precision, int, 0600) module_param_named(timestamp_monotonic, drm_timestamp_monotonic, int, 0600); static void store_vblank(struct drm_device *dev, int crtc, - unsigned vblank_count_inc, + u32 vblank_count_inc, struct timeval *t_vblank) { struct drm_vblank_crtc *vblank = &dev->vblank[crtc]; |