projects / platform / upstream / libdrm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 315cf14)
Fix merge problem.
authorAlan Hourihane <alanh@fairlite.demon.co.uk>
Fri, 18 May 2007 12:59:46 +0000 (13:59 +0100)
committerAlan Hourihane <alanh@fairlite.demon.co.uk>
Fri, 18 May 2007 12:59:46 +0000 (13:59 +0100)
shared-core/drm.h patch | blob | history

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 6453669..0f4a878 100644 (file)
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -789,7 +789,6 @@ typedef struct drm_fence_arg {
 
 typedef enum {
        drm_bo_type_dc,
-       drm_bo_type_kernel, /* for initial kernel allocations */
        drm_bo_type_user,
        drm_bo_type_fake,
        drm_bo_type_kernel, /* for initial kernel allocations */
Domain: System / Kernel;