From 5d77ba2532dd9f04fb4e49589642f642e5282e60 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 30 Dec 2010 09:07:15 +0000
Subject: [PATCH] --- yaml --- r: 223703 b: refs/heads/master c:
 bcfbbce822d219eb587acaba8a6e062bbeae4761 h: refs/heads/master i:   223701:
 2e10261e6fd41bcb5ce1ae126f8f5df09a4a04df   223699:
 3335c3be4412e5559e93c524852927dcf40e0ba7   223695:
 0bf26b2ce294b7ab7b7b196572de8a4504b6084f v: v3

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

diff --git a/[refs] b/[refs]
index f3793655a080..9ae0ad50c2b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d3024428f5c3ef5295e6f6fb257ae118b3f93a1
+refs/heads/master: bcfbbce822d219eb587acaba8a6e062bbeae4761
diff --git a/trunk/drivers/gpu/drm/i915/intel_bios.c b/trunk/drivers/gpu/drm/i915/intel_bios.c
index 2b2078695d2a..b0b1200ed650 100644
--- a/trunk/drivers/gpu/drm/i915/intel_bios.c
+++ b/trunk/drivers/gpu/drm/i915/intel_bios.c
@@ -270,7 +270,7 @@ parse_general_features(struct drm_i915_private *dev_priv,
 					general->ssc_freq ? 66 : 48;
 			else if (IS_GEN5(dev) || IS_GEN6(dev))
 				dev_priv->lvds_ssc_freq =
-					general->ssc_freq ? 120 : 100;
+					general->ssc_freq ? 100 : 120;
 			else
 				dev_priv->lvds_ssc_freq =
 					general->ssc_freq ? 100 : 96;