From f346bfb44200c376f5b5773787c352dc4b5aa662 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 3 Dec 2007 21:31:08 -0800
Subject: [PATCH] --- yaml --- r: 75726 b: refs/heads/master c:
 18041f4775688af073d9b3ab0ffc262c1847e60b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/kobject.h | 2 --
 trunk/lib/kobject.c           | 9 ++++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 588d08605ed1..02f66d178831 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 663a47430b361f863b515752a97166a7a4b92d35
+refs/heads/master: 18041f4775688af073d9b3ab0ffc262c1847e60b
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index 4a0d27f475d7..2d19a079ee79 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -79,8 +79,6 @@ static inline const char * kobject_name(const struct kobject * kobj)
 }
 
 extern void kobject_init(struct kobject *);
-extern void kobject_cleanup(struct kobject *);
-
 extern int __must_check kobject_add(struct kobject *);
 extern void kobject_del(struct kobject *);
 
diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c
index 4a310e55a886..a152036db006 100644
--- a/trunk/lib/kobject.c
+++ b/trunk/lib/kobject.c
@@ -436,12 +436,11 @@ struct kobject * kobject_get(struct kobject * kobj)
 	return kobj;
 }
 
-/**
- *	kobject_cleanup - free kobject resources. 
- *	@kobj:	object.
+/*
+ * kobject_cleanup - free kobject resources.
+ * @kobj: object to cleanup
  */
-
-void kobject_cleanup(struct kobject * kobj)
+static void kobject_cleanup(struct kobject *kobj)
 {
 	struct kobj_type * t = get_ktype(kobj);
 	struct kset * s = kobj->kset;