diff options
author | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
commit | 1e90b7ee8cefff59b70e285557aa7920dea77e81 (patch) | |
tree | 2132e5dcee9e5ef9693742100953063cd6423b3a /linux-core/drm_sman.c | |
parent | 0c34d0f31a691bb649ed69f19e93fc1a723aa1d4 (diff) | |
parent | 7b6cd95bb6c41653aed78952da0a461bd4791413 (diff) |
Merge branch 'master' into nouveau-1
Conflicts:
linux-core/Makefile.kernel
Diffstat (limited to 'linux-core/drm_sman.c')
-rw-r--r-- | linux-core/drm_sman.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-core/drm_sman.c b/linux-core/drm_sman.c index 425c8233..19a13f3a 100644 --- a/linux-core/drm_sman.c +++ b/linux-core/drm_sman.c @@ -101,10 +101,9 @@ static void *drm_sman_mm_allocate(void *private, unsigned long size, static void drm_sman_mm_free(void *private, void *ref) { - drm_mm_t *mm = (drm_mm_t *) private; drm_mm_node_t *node = (drm_mm_node_t *) ref; - drm_mm_put_block(mm, node); + drm_mm_put_block(node); } static void drm_sman_mm_destroy(void *private) |