Merge commit 'v2.6.37-rc7' into x86/security

[~andy/linux] / include / drm / drm.h

diff --git a/include/drm/drm.h b/include/drm/drm.h
index e3f46e0cb7dc305f8ab0b9ea7af3f96deb3bba0d..e5f70617dec55db8b8671c5d6c4444a23a698837 100644 (file)
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -663,6 +663,8 @@ struct drm_gem_open {
 #define DRM_IOCTL_UNLOCK               DRM_IOW( 0x2b, struct drm_lock)
 #define DRM_IOCTL_FINISH               DRM_IOW( 0x2c, struct drm_lock)
 
+#define DRM_IOCTL_GEM_PRIME_OPEN        DRM_IOWR(0x2e, struct drm_gem_open)
+
 #define DRM_IOCTL_AGP_ACQUIRE          DRM_IO(  0x30)
 #define DRM_IOCTL_AGP_RELEASE          DRM_IO(  0x31)
 #define DRM_IOCTL_AGP_ENABLE           DRM_IOW( 0x32, struct drm_agp_mode)