From: Dave Airlie <airlied@starflyer.(none)>
Date: Sat, 22 Oct 2005 05:25:01 +0000 (+1000)
Subject: merge linus head to drm-mm branch
X-Git-Tag: v2.6.15-rc1~18^2~14^2~2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf;p=linux-2.6

merge linus head to drm-mm branch
---

diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index e84a7876a1..3f73aa774c 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -155,7 +155,7 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
 	offset = address - vma->vm_start;
 	i = (unsigned long)map->handle + offset;
 	page = (map->type == _DRM_CONSISTENT) ?
-	    virt_to_page((void *)i) : vmalloc_to_page((void *)i);
+		virt_to_page((void *)i) : vmalloc_to_page((void *)i);
 	if (!page)
 		return NOPAGE_OOM;
 	get_page(page);