---

yaml --- r: 218179 b: refs/heads/master c: 185abec h: refs/heads/master i: 218177: a8e7cd5 218175: 25c3c47 v: v3
git-mirror · Sep 24, 2010 · add337b · add337b
1 parent d357da3
commit add337b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e05d7eaeba57921abad0ef564b0875e225171de8
+refs/heads/master: 185abeccabe5aed0ef79e8572c3916ea08034a45
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h b/trunk/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -741,7 +741,6 @@ extern void nouveau_channel_free(struct nouveau_channel *);
 extern int  nouveau_gpuobj_early_init(struct drm_device *);
 extern int  nouveau_gpuobj_init(struct drm_device *);
 extern void nouveau_gpuobj_takedown(struct drm_device *);
-extern void nouveau_gpuobj_late_takedown(struct drm_device *);
 extern int  nouveau_gpuobj_suspend(struct drm_device *dev);
 extern void nouveau_gpuobj_suspend_cleanup(struct drm_device *dev);
 extern void nouveau_gpuobj_resume(struct drm_device *dev);

diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_object.c b/trunk/drivers/gpu/drm/nouveau/nouveau_object.c
@@ -207,16 +207,11 @@ nouveau_gpuobj_takedown(struct drm_device *dev)
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
 	NV_DEBUG(dev, "\n");
-}
-
-void
-nouveau_gpuobj_late_takedown(struct drm_device *dev)
-{
-	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
 	BUG_ON(!list_empty(&dev_priv->gpuobj_list));
 }
 
+
 static void
 nouveau_gpuobj_del(struct kref *ref)
 {