Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / drivers / gpu / drm / sti / sti_plane.h

diff --git a/drivers/gpu/drm/sti/sti_plane.h b/drivers/gpu/drm/sti/sti_plane.h
index 39d39f5b7dd9ade89b2c7cf0c1ccc0c9a2979608..e0ea1dd3bb88984c8880eb9afb7f9e867de9398e 100644 (file)
--- a/drivers/gpu/drm/sti/sti_plane.h
+++ b/drivers/gpu/drm/sti/sti_plane.h
@@ -55,7 +55,7 @@ struct sti_fps_info {
        unsigned int last_frame_counter;
        unsigned int curr_field_counter;
        unsigned int last_field_counter;
-       struct timespec last_timestamp;
+       ktime_t      last_timestamp;
        char fps_str[FPS_LENGTH];
        char fips_str[FPS_LENGTH];
 };