diff options
| author | Alex Elder <aelder@sgi.com> | 2010-02-26 14:34:02 -0600 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-02-26 14:34:02 -0600 |
| commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
| tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /drivers/gpu/drm/ttm/ttm_object.c | |
| parent | d67b1b03254c501fef371b0e5916c94a52bfc2c5 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_object.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c index 1099abac824..75e9d6f86ba 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c @@ -109,8 +109,8 @@ struct ttm_ref_object { struct drm_hash_item hash; struct list_head head; struct kref kref; - struct ttm_base_object *obj; enum ttm_ref_type ref_type; + struct ttm_base_object *obj; struct ttm_object_file *tfile; }; |