Fix more merge fallout

This commit is contained in:
Alex Deucher 2009-07-16 02:59:36 -04:00
parent 92a2f0164a
commit 11606e873d
2 changed files with 1 additions and 2 deletions

View file

@ -521,7 +521,7 @@ static int r600_cs_check_space(struct radeon_cs *cs, struct radeon_cs_space_chec
write_domain = bos[i].write_domain;
/* pinned bos don't count */
if (radeon_legacy_bo_is_static(bo))
if (radeon_bo_is_static(bo))
continue;
/* already accounted this bo */

View file

@ -43,5 +43,4 @@ void radeon_bo_manager_legacy_dtor(struct radeon_bo_manager *bom);
void radeon_bo_legacy_texture_age(struct radeon_bo_manager *bom);
unsigned radeon_bo_legacy_relocs_size(struct radeon_bo *bo);
int radeon_legacy_bo_is_static(struct radeon_bo *bo);
#endif