From 2d7bc2c4e512baa56190d5d1cf2cbc07557dd993 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@starflyer.(none)>
Date: Sat, 22 Oct 2005 15:25:01 +1000
Subject: [PATCH] --- yaml --- r: 12147 b: refs/heads/master c:
 5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf h: refs/heads/master i:   12145:
 d6d920b6456f438b926fdde091d05e248f246f2a   12143:
 f455d82a85180ae73fa6c4427d159b8798555e9a v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/char/drm/drm_vm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ace9e62a4f80..c832f1024e35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23bfc1a339e98510f2ce25a2764a0cfe195faa9e
+refs/heads/master: 5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf
diff --git a/trunk/drivers/char/drm/drm_vm.c b/trunk/drivers/char/drm/drm_vm.c
index e84a7876a1b3..3f73aa774c80 100644
--- a/trunk/drivers/char/drm/drm_vm.c
+++ b/trunk/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);