aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm/ttm/ttm_object.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-12-17 18:53:50 -0500
committerDave Airlie <airlied@redhat.com>2009-12-17 18:53:50 -0500
commitcbc8cc049aefd571ebc3c255dc3e265f736751c0 (patch)
tree46626ce409b71790af6220ee0518be694693af99 /include/drm/ttm/ttm_object.h
parent5012f5063f41ca01240e5983c3b2cceb9aafc7a4 (diff)
parentfb1d9738ca053ea8afa5e86af6463155f983b01c (diff)
Merge remote branch 'korg/drm-vmware-staging' into drm-core-next
Diffstat (limited to 'include/drm/ttm/ttm_object.h')
-rw-r--r--include/drm/ttm/ttm_object.h6
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 {
77 ttm_buffer_type, 77 ttm_buffer_type,
78 ttm_lock_type, 78 ttm_lock_type,
79 ttm_driver_type0 = 256, 79 ttm_driver_type0 = 256,
80 ttm_driver_type1 80 ttm_driver_type1,
81 ttm_driver_type2,
82 ttm_driver_type3,
83 ttm_driver_type4,
84 ttm_driver_type5
81}; 85};
82 86
83struct ttm_object_file; 87struct ttm_object_file;