Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes

[linux-beck.git] / include / drm / drmP.h

diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 4717449d6aa90be0fa24f7f8e9cecc03e2489439..5908848d86b38a331bd9c11556de5d05da77aaf2 100644 (file)
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -691,7 +691,7 @@ struct drm_vblank_crtc {
        struct timer_list disable_timer;                /* delayed disable timer */
 
        /* vblank counter, protected by dev->vblank_time_lock for writes */
-       unsigned long count;
+       u32 count;
        /* vblank timestamps, protected by dev->vblank_time_lock for writes */
        struct timeval time[DRM_VBLANKTIME_RBSIZE];