From a8aa314a3188dc1a6e5b4e18d96c2462a65ac3a5 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 19 Dec 2007 11:26:50 -0800
Subject: [PATCH] --- yaml --- r: 75855 b: refs/heads/master c:
 6d06adfaf82d154023141ddc0c9de18b6a49090b h: refs/heads/master i:   75853:
 aa7e8d22b19cda4868c65d42293116ad0e4989b2   75851:
 ad889f2d5c9fe1b49c9c56f1b717c7ea20910252   75847:
 115529bbd6c0bbaffbd3f037e94b172b759ba790   75839:
 21843c0850fc18ce5e8ffa9c3bf7e858ac7ce976 v: v3

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

diff --git a/[refs] b/[refs]
index d422ef7c5855..2fb6f8eed1cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9cb074bff8e762ef24c44678a5a7d907f82fbeb
+refs/heads/master: 6d06adfaf82d154023141ddc0c9de18b6a49090b
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index d9d8c368f044..259084758617 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -96,7 +96,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 int __must_check kobject_register(struct kobject *);
 extern void kobject_unregister(struct kobject *);
 
 extern struct kobject * kobject_get(struct kobject *);
diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c
index 4cc231c86225..3326281c96b6 100644
--- a/trunk/lib/kobject.c
+++ b/trunk/lib/kobject.c
@@ -219,23 +219,6 @@ static int kobject_add_internal(struct kobject *kobj)
 	return error;
 }
 
-/**
- *	kobject_register - initialize and add an object.
- *	@kobj:	object in question.
- */
-
-int kobject_register(struct kobject * kobj)
-{
-	int error = -EINVAL;
-	if (kobj) {
-		kobject_init_internal(kobj);
-		error = kobject_add(kobj);
-		if (!error)
-			kobject_uevent(kobj, KOBJ_ADD);
-	}
-	return error;
-}
-
 /**
  * kobject_set_name_vargs - Set the name of an kobject
  * @kobj: struct kobject to set the name of
@@ -883,7 +866,6 @@ struct kset *kset_create_and_add(const char *name,
 }
 EXPORT_SYMBOL_GPL(kset_create_and_add);
 
-EXPORT_SYMBOL(kobject_register);
 EXPORT_SYMBOL(kobject_unregister);
 EXPORT_SYMBOL(kobject_get);
 EXPORT_SYMBOL(kobject_put);