From 8bd28db1de416ecfc1959af3fb0ddc63c2fb4ac3 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 28 May 2010 10:04:05 +1000
Subject: [PATCH] --- yaml --- r: 199687 b: refs/heads/master c:
 2c58077541cc6859a9a9046d9c3a4d61bdbd4f18 h: refs/heads/master i:   199685:
 fdc5600213264797b249d0ad779c8e107d1fb150   199683:
 a02b48a5be686312b984575aa1e2cdad02c4e21b   199679:
 813dfd27e1233fdb236c6ea57ba88f738697492f v: v3

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

diff --git a/[refs] b/[refs]
index 61a519f261ab..dadb2f8ee2fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23484874e6bf837704bf1fa61605d33a12b174e3
+refs/heads/master: 2c58077541cc6859a9a9046d9c3a4d61bdbd4f18
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7e663a79829f..bfa65629517b 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -593,8 +593,7 @@ nouveau_connector_mode_valid(struct drm_connector *connector,
 		break;
 	case OUTPUT_TMDS:
 		if ((dev_priv->card_type >= NV_50 && !nouveau_duallink) ||
-		    (dev_priv->card_type < NV_50 &&
-		     !nv_encoder->dcb->duallink_possible))
+		    !nv_encoder->dcb->duallink_possible)
 			max_clock = 165000;
 		else
 			max_clock = 330000;