From d37c90622634c7403fae8318f0656f02e983e4cc Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Sat, 10 Jul 2010 17:37:00 +0200
Subject: [PATCH] --- yaml --- r: 205079 b: refs/heads/master c:
 77144554de9af353795698161af26e36f7cdbbef h: refs/heads/master i:   205077:
 652e2b399aec72ee988afc2f5fd1047c83ccb026   205075:
 e70c815462ff36b445417b8fa50659953e6e5310   205071:
 cf900268863b2d9d9715800670e8455ce8901e7b v: v3

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

diff --git a/[refs] b/[refs]
index 082610a500f0..c2de2f504610 100644
--- 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
index 728f5550e68b..2fb2444d2322 100644
--- 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;