Module Name: xsrc
Committed By: snj
Date: Wed Mar 11 06:26:44 UTC 2015
Modified Files:
xsrc/external/mit/libdrm/dist/include/drm [netbsd-7]: i915_drm.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #584):
external/mit/libdrm/dist/include/drm/i915_drm.h: revision 1.2
fix cut-n-paste error
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libdrm/dist/include/drm/i915_drm.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/include/drm/i915_drm.h
diff -u xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.1 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.2
--- xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.1 Tue Dec 23 01:16:57 2014
+++ xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h Wed Mar 11 06:26:44 2015
@@ -268,7 +268,7 @@ typedef struct _drm_i915_sarea {
#define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image)
#define DRM_IOCTL_I915_OVERLAY_ATTRS DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs)
#define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
-#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
+#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
#define DRM_IOCTL_I915_GEM_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait)
#define DRM_IOCTL_I915_GEM_CONTEXT_CREATE DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
#define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)
