---

yaml --- r: 260109 b: refs/heads/master c: f8656f0 h: refs/heads/master i: 260107: 67b9231 v: v3
git-mirror · Jun 23, 2011 · 2aa3f39 · 2aa3f39
1 parent 6dd9041
commit 2aa3f39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f0a68d8f8ba9d6c0cd9df948fbba90944c3da62
+refs/heads/master: f8656f0baa316d1f08e224248e0b40ade85a4e80
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -449,8 +449,8 @@ nouveau_card_init_channel(struct drm_device *dev)
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	int ret;
 
-	ret = nouveau_channel_alloc(dev, &dev_priv->channel,
-				    (struct drm_file *)-2, NvDmaFB, NvDmaTT);
+	ret = nouveau_channel_alloc(dev, &dev_priv->channel, NULL,
+				    NvDmaFB, NvDmaTT);
 	if (ret)
 		return ret;