diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-18 09:53:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-18 09:53:50 +1000 |
| commit | cbc8cc049aefd571ebc3c255dc3e265f736751c0 (patch) | |
| tree | 46626ce409b71790af6220ee0518be694693af99 /include/drm/ttm | |
| parent | 5012f5063f41ca01240e5983c3b2cceb9aafc7a4 (diff) | |
| parent | fb1d9738ca053ea8afa5e86af6463155f983b01c (diff) | |
| download | blackbird-op-linux-cbc8cc049aefd571ebc3c255dc3e265f736751c0.tar.gz blackbird-op-linux-cbc8cc049aefd571ebc3c255dc3e265f736751c0.zip | |
Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
Diffstat (limited to 'include/drm/ttm')
| -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; |
