---

yaml --- r: 287149 b: refs/heads/master c: a9d9938 h: refs/heads/master i: 287147: 6ed7c25 v: v3
git-mirror · Feb 1, 2012 · 760668a · 760668a
1 parent d90647b
commit 760668a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 525895ba388c949aa906f26e3ec5cb1ab041f56b
+refs/heads/master: a9d993882008a1ae2c953064f0c2ca7e604b1333
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_pm.c b/trunk/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -495,9 +495,9 @@ nv50_pm_clocks_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl)
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 	struct nv50_pm_state *info;
 	struct pll_lims pll;
-	int ret = -EINVAL;
+	int clk, ret = -EINVAL;
 	int N, M, P1, P2;
-	u32 clk, out;
+	u32 out;
 
 	if (dev_priv->chipset == 0xaa ||
 	    dev_priv->chipset == 0xac)