Module Name: xsrc
Committed By: mrg
Date: Fri Jul 11 20:03:34 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist: xf86drmMode.h
Log Message:
fix a merge botch
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/libdrm/dist/xf86drmMode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86drmMode.h
diff -u xsrc/external/mit/libdrm/dist/xf86drmMode.h:1.1.1.3 xsrc/external/mit/libdrm/dist/xf86drmMode.h:1.2
--- xsrc/external/mit/libdrm/dist/xf86drmMode.h:1.1.1.3 Fri Jul 11 19:51:38 2014
+++ xsrc/external/mit/libdrm/dist/xf86drmMode.h Fri Jul 11 20:03:34 2014
@@ -445,7 +445,7 @@ extern drmModePlaneResPtr drmModeGetPlan
extern drmModePlanePtr drmModeGetPlane(int fd, uint32_t plane_id);
extern int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id,
uint32_t fb_id, uint32_t flags,
- int32_t crtc_x, int32_t crtc_y,
+ uint32_t crtc_x, uint32_t crtc_y,
uint32_t crtc_w, uint32_t crtc_h,
uint32_t src_x, uint32_t src_y,
uint32_t src_w, uint32_t src_h);
