diff options
| author | Linus Torvalds <[email protected]> | 2009-12-16 21:19:31 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-12-16 21:19:31 +0000 |
| commit | 5fa3577b1a1202972e6e419040438c29f39f59cc (patch) | |
| tree | f148c5bfad584ba8ac79d43fd3e40a12d49d92af /include/drm/ttm/ttm_object.h | |
| parent | Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/l... (diff) | |
| parent | drm/vmwgfx: Add DRM driver for VMware Virtual GPU (diff) | |
| download | kernel-5fa3577b1a1202972e6e419040438c29f39f59cc.tar.gz kernel-5fa3577b1a1202972e6e419040438c29f39f59cc.zip | |
Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/vmwgfx: Add DRM driver for VMware Virtual GPU
drm/vmwgfx: Add svga headers for vmwgfx driver
drm/ttm: Add more driver type enums
Diffstat (limited to 'include/drm/ttm/ttm_object.h')
| -rw-r--r-- | include/drm/ttm/ttm_object.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/drm/ttm/ttm_object.h b/include/drm/ttm/ttm_object.h index 703ca4db0a29..0d9db099978b 100644 --- a/include/drm/ttm/ttm_object.h +++ b/include/drm/ttm/ttm_object.h @@ -77,7 +77,11 @@ enum ttm_object_type { ttm_buffer_type, ttm_lock_type, ttm_driver_type0 = 256, - ttm_driver_type1 + ttm_driver_type1, + ttm_driver_type2, + ttm_driver_type3, + ttm_driver_type4, + ttm_driver_type5 }; struct ttm_object_file; |