From 7dbe758153292fe7b0a8669d8d6856f7088cc8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin@0x04.net>
Date: Mon, 21 May 2012 14:51:50 +0200
Subject: [PATCH] --- yaml --- r: 307571 b: refs/heads/master c:
 af3289e96383a60f5d3096afeb5579b837aad5e0 h: refs/heads/master i:   307569:
 3f2398f611bffc4bfc356ea0d3976065a3c3d6c5   307567:
 7de455206a7e326db05bf9321c005965ec452ca4 v: v3

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

diff --git a/[refs] b/[refs]
index f93496429c2a..971a56f99fe4 100644
--- 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
index a580cc62337a..82c19e82ff02 100644
--- 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 };