From 1d35083674ebde4192e17aa3fbef7ce7dd0094ce Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 20 Dec 2007 08:13:05 -0800
Subject: [PATCH] --- yaml --- r: 75863 b: refs/heads/master c:
 528a4bf1d5ffed310d26fc1d82d45c02949f71cf h: refs/heads/master i:   75861:
 3b6eabfe6343a1d6fb01de9f013a11ae692d1ee8   75859:
 1f4de5c6a720f38f14bb7aeeb98d3bf39ec712d4   75855:
 a8aa314a3188dc1a6e5b4e18d96c2462a65ac3a5 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/kobject.h |  2 --
 trunk/lib/kobject.c           | 17 -----------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index ee8468bda0b4..605ec4e47e96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78a2d906b40fe530ea800c1e873bfe8f02326f1e
+refs/heads/master: 528a4bf1d5ffed310d26fc1d82d45c02949f71cf
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index be03ce83f9cc..504ac0eb4412 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -101,8 +101,6 @@ extern struct kobject * __must_check kobject_create_and_add(const char *name,
 extern int __must_check kobject_rename(struct kobject *, const char *new_name);
 extern int __must_check kobject_move(struct kobject *, struct kobject *);
 
-extern void kobject_unregister(struct kobject *);
-
 extern struct kobject * kobject_get(struct kobject *);
 extern void kobject_put(struct kobject *);
 
diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c
index 462946ee3e64..a0773734545c 100644
--- a/trunk/lib/kobject.c
+++ b/trunk/lib/kobject.c
@@ -532,22 +532,6 @@ void kobject_del(struct kobject * kobj)
 	kobj->parent = NULL;
 }
 
-/**
- *	kobject_unregister - remove object from hierarchy and decrement refcount.
- *	@kobj:	object going away.
- */
-
-void kobject_unregister(struct kobject * kobj)
-{
-	if (!kobj)
-		return;
-	pr_debug("kobject: '%s' (%p): %s\n",
-		 kobject_name(kobj), kobj, __FUNCTION__);
-	kobject_uevent(kobj, KOBJ_REMOVE);
-	kobject_del(kobj);
-	kobject_put(kobj);
-}
-
 /**
  *	kobject_get - increment refcount for object.
  *	@kobj:	object.
@@ -877,7 +861,6 @@ struct kset *kset_create_and_add(const char *name,
 }
 EXPORT_SYMBOL_GPL(kset_create_and_add);
 
-EXPORT_SYMBOL(kobject_unregister);
 EXPORT_SYMBOL(kobject_get);
 EXPORT_SYMBOL(kobject_put);
 EXPORT_SYMBOL(kobject_del);