---

yaml --- r: 282620 b: refs/heads/master c: d467646 h: refs/heads/master v: v3
git-mirror · Dec 21, 2011 · e63d44c · e63d44c
1 parent 54bd915
commit e63d44c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 091e40cd9529968bacbbb18fc05d6dea65421a5b
+refs/heads/master: d4676461a75699ec0f6d271e3fe75ee631755c6e
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -295,7 +295,7 @@ read_clk(struct drm_device *dev, enum clk_src src)
 			case 0x00000800:
 				return read_clk(dev, clk_src_hclkm3d2) >> P;
 			case 0x00000c00:
-				return read_pll(dev, clk_src_mclk) >> P;
+				return read_clk(dev, clk_src_mclk) >> P;
 			}
 			break;
 		}