Mesa (r6xx-rewrite): Fix more merge fallout

[Alex Deucher]

Module: Mesa
Branch: r6xx-rewrite
Commit: 11606e873d38a320195ab4e23181579f766ae45c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=11606e873d38a320195ab4e23181579f766ae45c

Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Thu Jul 16 02:59:36 2009 -0400

Fix more merge fallout

---

 src/mesa/drivers/dri/r600/r600_cmdbuf.c        |    2 +-
 src/mesa/drivers/dri/radeon/radeon_bo_legacy.h |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r600_cmdbuf.c b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
index 7bde336..95a311d 100644
--- a/src/mesa/drivers/dri/r600/r600_cmdbuf.c
+++ b/src/mesa/drivers/dri/r600/r600_cmdbuf.c
@@ -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 */
diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h
index 9187cd7..0db817c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.h
@@ -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