---

yaml --- r: 307571 b: refs/heads/master c: af3289e h: refs/heads/master i: 307569: 3f2398f 307567: 7de4552 v: v3
git-mirror · May 24, 2012 · 7dbe758 · 7dbe758
1 parent 4a967b6
commit 7dbe758
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: 5c5ed6e2cd8b8f944cc7a27fb8a66b695dccf32f
+refs/heads/master: af3289e96383a60f5d3096afeb5579b837aad5e0
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_gpio.c b/trunk/drivers/gpu/drm/nouveau/nouveau_gpio.c
@@ -387,7 +387,7 @@ nouveau_gpio_reset(struct drm_device *dev)
 		if (dev_priv->card_type >= NV_D0) {
 			nv_mask(dev, 0x00d610 + (line * 4), 0xff, unk0);
 			if (unk1--)
-				nv_mask(dev, 0x00d640 + (unk1 * 4), 0xff, line);
+				nv_mask(dev, 0x00d740 + (unk1 * 4), 0xff, line);
 		} else
 		if (dev_priv->card_type >= NV_50) {
 			static const u32 regs[] = { 0xe100, 0xe28c };