diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-05-18 13:59:46 +0100 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2007-05-18 13:59:46 +0100 |
| commit | 3851600b3450697e20286b1937f3e51397f1965a (patch) | |
| tree | f7096ebdb05d46bf5ffc6c96a7fa11d570e9caed /shared-core | |
| parent | 315cf14af814da60285adb95238181de430c6f68 (diff) | |
Fix merge problem.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index 64536690..0f4a878b 100644 --- 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 */ |