Fix merge problem.

main
Alan Hourihane 2007-05-18 13:59:46 +01:00
parent 315cf14af8
commit 3851600b34
1 changed files with 0 additions and 1 deletions

View File

@ -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 */