---

yaml --- r: 205079 b: refs/heads/master c: 7714455 h: refs/heads/master i: 205077: 652e2b3 205075: e70c815 205071: cf90026 v: v3
git-mirror · Jul 13, 2010 · d37c906 · d37c906
1 parent de7ed02
commit d37c906
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: e88efe056d308d0a3b6b645d0eec7236b2d8c902
+refs/heads/master: 77144554de9af353795698161af26e36f7cdbbef
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/trunk/drivers/gpu/drm/nouveau/nouveau_fbcon.c
@@ -387,7 +387,8 @@ int nouveau_fbcon_init(struct drm_device *dev)
 	dev_priv->nfbdev = nfbdev;
 	nfbdev->helper.funcs = &nouveau_fbcon_helper_funcs;
 
-	ret = drm_fb_helper_init(dev, &nfbdev->helper, 2, 4);
+	ret = drm_fb_helper_init(dev, &nfbdev->helper,
+				 nv_two_heads(dev) ? 2 : 1, 4);
 	if (ret) {
 		kfree(nfbdev);
 		return ret;