---

yaml --- r: 228621 b: refs/heads/master c: 910d1b3 h: refs/heads/master i: 228619: d3ed3e8 v: v3
git-mirror · Dec 21, 2010 · c4cdf99 · c4cdf99
1 parent a720a67
commit c4cdf99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;