---

yaml --- r: 323034 b: refs/heads/master c: 18d4dbd h: refs/heads/master v: v3
git-mirror · Sep 20, 2012 · 35454f6 · 35454f6
1 parent 56ed5f1
commit 35454f6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d4f5cc8816ee41c3277f35a91bee681636c6ff1
+refs/heads/master: 18d4dbd8866a34507d52495207ef5fcec6d41049
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_gpio.c b/trunk/drivers/gpu/drm/nouveau/nv50_gpio.c
@@ -115,9 +115,6 @@ nv50_gpio_init(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
-	/* initialise gpios and routing to vbios defaults */
-	nouveau_gpio_reset(dev);
-
 	/* disable, and ack any pending gpio interrupts */
 	nv_wr32(dev, 0xe050, 0x00000000);
 	nv_wr32(dev, 0xe054, 0xffffffff);