diff options
| author | Ingo Molnar | 2011-01-04 08:08:51 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2011-01-04 08:08:54 +0100 |
| commit | cc2221969906a166a638aecdbae84a3d0462719e (patch) | |
| tree | 2483f726e226c309207e1d0250660eea6e1787b8 /drivers/gpu/drm/i915/intel_bios.c | |
| parent | Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/opr... (diff) | |
| parent | Linux 2.6.37-rc8 (diff) | |
| download | kernel-qcow2-linux-cc2221969906a166a638aecdbae84a3d0462719e.tar.gz kernel-qcow2-linux-cc2221969906a166a638aecdbae84a3d0462719e.tar.xz kernel-qcow2-linux-cc2221969906a166a638aecdbae84a3d0462719e.zip | |
Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index b0b1200ed650..2b2078695d2a 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/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 ? 100 : 120; + general->ssc_freq ? 120 : 100; else dev_priv->lvds_ssc_freq = general->ssc_freq ? 100 : 96; |