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_bo.c | |
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_bo.c')
-rw-r--r-- | linux-core/drm_bo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c index b6115e8d..c41f726c 100644 --- a/linux-core/drm_bo.c +++ b/linux-core/drm_bo.c @@ -1065,7 +1065,7 @@ static int drm_bo_busy(struct drm_buffer_object *bo) return 0; } -static int drm_bo_evict_cached(struct drm_buffer_object *bo) +int drm_bo_evict_cached(struct drm_buffer_object *bo) { int ret = 0; @@ -1075,6 +1075,7 @@ static int drm_bo_evict_cached(struct drm_buffer_object *bo) return ret; } +EXPORT_SYMBOL(drm_bo_evict_cached); /* * Wait until a buffer is unmapped. */ |