diff options
author | Dave Airlie <airlied@linux.ie> | 2008-03-06 05:26:23 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-03-06 05:26:23 +1000 |
commit | e00dea812ddb9b483de9f58f7a7aa7105427512d (patch) | |
tree | 9ffef663b16a3c444ea9a294d635be4e81e6fe99 /linux-core/drm_objects.h | |
parent | f78cdac8e512642db1aaf09bf9178e23ede25586 (diff) | |
parent | 12574590cdf7871755d1939463ca6898251fd0d1 (diff) |
Merge branch 'master' of ../../drm into modesetting-101
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_proc.c
linux-core/drm_stub.c
linux-core/drm_sysfs.c
Diffstat (limited to 'linux-core/drm_objects.h')
-rw-r--r-- | linux-core/drm_objects.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_objects.h b/linux-core/drm_objects.h index 802e72cf..8f81b665 100644 --- a/linux-core/drm_objects.h +++ b/linux-core/drm_objects.h @@ -700,7 +700,7 @@ extern int drm_bo_do_validate(struct drm_buffer_object *bo, uint64_t flags, uint64_t mask, uint32_t hint, uint32_t fence_class, struct drm_bo_info_rep *rep); - +extern int drm_bo_evict_cached(struct drm_buffer_object *bo); /* * Buffer object memory move- and map helpers. * drm_bo_move.c |