Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / drivers / char / drm / drm_sman.c

diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c
index 19c81d2e13d01f2cb9cea0be7ecd936294dbed2a..e15db6d6bea9bb2f95d7d26f01f884ae1f629107 100644 (file)
--- a/drivers/char/drm/drm_sman.c
+++ b/drivers/char/drm/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)