diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-08-01 13:35:56 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-08-01 13:35:56 -0400 |
| commit | 086716c8e2516dd71e94ebda03e20943188a5e5e (patch) | |
| tree | 860462e19e868694f0e8838bc7418cc69fab0391 /linux-core/drm_bo_move.c | |
| parent | 5052e966ec7fe5146c2d73b90482003619add5da (diff) | |
| parent | ccbaad52f79162a77d98d0dde00681b1dbf14165 (diff) | |
Merge commit 'origin/drm-gem' into modesetting-gem
Conflicts:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_mm.c
linux-core/drm_stub.c
linux-core/i915_gem.c
linux-core/i915_opregion.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/drm_bo_move.c')
| -rw-r--r-- | linux-core/drm_bo_move.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_bo_move.c b/linux-core/drm_bo_move.c index 9147a475..5c290af2 100644 --- a/linux-core/drm_bo_move.c +++ b/linux-core/drm_bo_move.c @@ -41,7 +41,7 @@ static void drm_bo_free_old_node(struct drm_buffer_object *bo) if (old_mem->mm_node && (old_mem->mm_node != bo->pinned_node)) { mutex_lock(&bo->dev->struct_mutex); - drm_memrange_put_block(old_mem->mm_node); + drm_mm_put_block(old_mem->mm_node); mutex_unlock(&bo->dev->struct_mutex); } old_mem->mm_node = NULL; |