From 0009f324242b73d9c543a2ea2bb03a31c9b65fb9 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Tue, 9 Oct 2012 00:19:50 +0200
Subject: [PATCH] --- yaml --- r: 332992 b: refs/heads/master c:
 d489738951200a12171a63c29e8cd4876031a03b h: refs/heads/master v: v3

---
 [refs]                                          |  2 +-
 .../drivers/gpu/drm/nouveau/core/core/parent.c  | 17 -----------------
 .../gpu/drm/nouveau/core/include/core/parent.h  |  3 ---
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 937a31d0f3e7..ca66aab0b3ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a334cd0de2f43b29c192548000692bad52edfc6
+refs/heads/master: d489738951200a12171a63c29e8cd4876031a03b
diff --git a/trunk/drivers/gpu/drm/nouveau/core/core/parent.c b/trunk/drivers/gpu/drm/nouveau/core/core/parent.c
index a1ea034611d5..db7c54943102 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/core/parent.c
+++ b/trunk/drivers/gpu/drm/nouveau/core/core/parent.c
@@ -101,23 +101,6 @@ nouveau_parent_create_(struct nouveau_object *parent,
 	return 0;
 }
 
-int
-_nouveau_parent_ctor(struct nouveau_object *parent,
-		     struct nouveau_object *engine,
-		     struct nouveau_oclass *oclass, void *data, u32 size,
-		     struct nouveau_object **pobject)
-{
-	struct nouveau_parent *object;
-	int ret;
-
-	ret = nouveau_parent_create(parent, engine, oclass, 0, NULL, 0, &object);
-	*pobject = nv_object(object);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
 void
 nouveau_parent_destroy(struct nouveau_parent *parent)
 {
diff --git a/trunk/drivers/gpu/drm/nouveau/core/include/core/parent.h b/trunk/drivers/gpu/drm/nouveau/core/include/core/parent.h
index d3aa251a5eb6..3c2e940eb0f8 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/include/core/parent.h
+++ b/trunk/drivers/gpu/drm/nouveau/core/include/core/parent.h
@@ -50,9 +50,6 @@ int  nouveau_parent_create_(struct nouveau_object *, struct nouveau_object *,
 			    int size, void **);
 void nouveau_parent_destroy(struct nouveau_parent *);
 
-int  _nouveau_parent_ctor(struct nouveau_object *, struct nouveau_object *,
-			  struct nouveau_oclass *, void *, u32,
-			  struct nouveau_object **);
 void _nouveau_parent_dtor(struct nouveau_object *);
 #define _nouveau_parent_init _nouveau_object_init
 #define _nouveau_parent_fini _nouveau_object_fini