Merge branch 'linus' into core/rodata

[linux-2.6-block.git] / drivers / char / drm / drm_mm.c

diff --git a/drivers/char/drm/drm_mm.c b/drivers/char/drm/drm_mm.c
index 86f4eb61a6a46c2a26247852231e5a612bf1a73e..dcff9e9b52e327016ee53590a98ea8b21d44d362 100644 (file)
--- a/drivers/char/drm/drm_mm.c
+++ b/drivers/char/drm/drm_mm.c
@@ -293,4 +293,3 @@ void drm_mm_takedown(struct drm_mm * mm)
 
        drm_free(entry, sizeof(*entry), DRM_MEM_MM);
 }
-