Merge git://git.kvack.org/~bcrl/aio-next

[karo-tx-linux.git] / drivers / gpu / drm / shmobile / shmob_drm_crtc.c

diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index 99e2034e49ccf0687e4096e5912b025e6dc3df4f..54bad98e9477589742eb21fecb10fd30f560f209 100644 (file)
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -465,7 +465,8 @@ void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc)
 
 static int shmob_drm_crtc_page_flip(struct drm_crtc *crtc,
                                    struct drm_framebuffer *fb,
-                                   struct drm_pending_vblank_event *event)
+                                   struct drm_pending_vblank_event *event,
+                                   uint32_t page_flip_flags)
 {
        struct shmob_drm_crtc *scrtc = to_shmob_crtc(crtc);
        struct drm_device *dev = scrtc->crtc.dev;