Merge branch 'pageflip' of git://people.freedesktop.org/~jbarnes/drm

Conflicts:
	include/drm/drm.h - RMFB had its signature changed to avoid uint32_t

1 files changed, 6 insertions, 0 deletions

diff --git a/xf86drm.h b/xf86drm.h
index 496d95d8..89f1db18 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -707,6 +707,12 @@ typedef struct _drmEventContext {
 			       unsigned int tv_usec,
 			       void *user_data);
 
+	void (*page_flip_handler)(int fd,
+				  unsigned int sequence,
+				  unsigned int tv_sec,
+				  unsigned int tv_usec,
+				  void *user_data);
+
 } drmEventContext, *drmEventContextPtr;
 
 extern int drmHandleEvent(int fd, drmEventContextPtr evctx);