From c4cdf995cf69ece4cd6aa38809c391bec618e37c Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 21 Dec 2010 11:15:44 +1000
Subject: [PATCH] --- yaml --- r: 228621 b: refs/heads/master c:
 910d1b3a8cec4fef20f11eb39e9ec6ac6e964b0e h: refs/heads/master i:   228619:
 d3ed3e8ccde79a8b3df3a486b579bf4ab9b696c6 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/nouveau/nv50_vm.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0ce1aeb3c82b..bc6ffd11be6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d095e23206e6291cbde4b2937d1316a42d9e6440
+refs/heads/master: 910d1b3a8cec4fef20f11eb39e9ec6ac6e964b0e
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_vm.c b/trunk/drivers/gpu/drm/nouveau/nv50_vm.c
index eebab95f59b2..7939387f7f80 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv50_vm.c
@@ -91,7 +91,8 @@ void
 nv50_vm_map(struct nouveau_vma *vma, struct nouveau_gpuobj *pgt,
 	    struct nouveau_vram *mem, u32 pte, u32 cnt, u64 phys)
 {
-	u32 block, i;
+	u32 block;
+	int i;
 
 	phys  = nv50_vm_addr(vma, pgt, phys, mem->memtype, 0);
 	pte <<= 3;