From e203cd86953444d5153bc0399b9c4c80cf814d58 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 27 Aug 2010 11:58:49 +1000
Subject: [PATCH] --- yaml --- r: 218162 b: refs/heads/master c:
 e694438d2f55d71da3491b1a2472383cec4b8236 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_dma.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b43ae5059390..63104329d70a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8a6a8045d4d3e5b7330603c35cbfaf9f3cc2e50
+refs/heads/master: e694438d2f55d71da3491b1a2472383cec4b8236
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c
index 2e3c6caa97ee..2d006993378a 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_dma.c
@@ -91,11 +91,6 @@ nouveau_dma_init(struct nouveau_channel *chan)
 	if (ret)
 		return ret;
 
-	/* Map M2MF notifier object - fbcon. */
-	ret = nouveau_bo_map(chan->notifier_bo);
-	if (ret)
-		return ret;
-
 	/* Insert NOPS for NOUVEAU_DMA_SKIPS */
 	ret = RING_SPACE(chan, NOUVEAU_DMA_SKIPS);
 	if (ret)