Merge remote branch 'upstream/master' into i915-zone-rendering

This commit is contained in:
Michel Dänzer 2007-05-01 17:26:31 +02:00
commit 0eb514b084

View file

@ -788,9 +788,9 @@ 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_fake,
drm_bo_type_kernel, /* for initial kernel allocations */
}drm_bo_type_t;