From 45de04acdc04921b9d095cb4aec6329505b9fbe5 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 3 Jun 2011 15:47:39 +1000
Subject: [PATCH] --- yaml --- r: 260111 b: refs/heads/master c:
 d359d51cba731a72fede6c09b1d567de02f081dc h: refs/heads/master i:   260109:
 2aa3f39f76106696225cf8d23f5183c348d98d19   260107:
 67b923174d4fd2834560f04d7100dadf8b5d2f4c   260103:
 9d0284b66405ce0b72169e072a01d0c1614a7e02   260095:
 f5fe194046ad5229416ae9287eaed57ac106ac24 v: v3

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

diff --git a/[refs] b/[refs]
index 3d258ffa62ec..b4cd4893c94d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8a863c10f4ca47e942886dddf70c35e3c2d5dd6
+refs/heads/master: d359d51cba731a72fede6c09b1d567de02f081dc
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
index 2ad49cbf7c8b..633f724b6baf 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -312,8 +312,6 @@ nouveau_bo_validate(struct nouveau_bo *nvbo, bool interruptible,
 	if (ret)
 		return ret;
 
-	if (nvbo->vma.node)
-		nvbo->bo.offset = nvbo->vma.offset;
 	return 0;
 }