---

yaml --- r: 68000 b: refs/heads/master c: e4bc166 h: refs/heads/master v: v3
git-mirror · Oct 12, 2007 · 1bf6690 · 1bf6690
1 parent 4ec373f
commit 1bf6690
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4e8b912541d5372ae049a3b7c1979968e52c40b
+refs/heads/master: e4bc16621d82ee1fd3685dcbf889a7c49891847b
diff --git a/trunk/Documentation/kobject.txt b/trunk/Documentation/kobject.txt
@@ -238,7 +238,6 @@ kobj_set_kset_s(obj,subsys)
 - Assumes that obj->kobj exists, and is a struct kobject.
 - Sets the kset of that kobject to the kset <subsys>.
 
-void subsystem_init(struct kset *s);
 int subsystem_register(struct kset *s);
 void subsystem_unregister(struct kset *s);
 

diff --git a/trunk/drivers/base/class.c b/trunk/drivers/base/class.c
@@ -861,7 +861,7 @@ int __init classes_init(void)
 
 	/* ick, this is ugly, the things we go through to keep from showing up
 	 * in sysfs... */
-	subsystem_init(&class_obj_subsys);
+	kset_init(&class_obj_subsys);
 	if (!class_obj_subsys.kobj.parent)
 		class_obj_subsys.kobj.parent = &class_obj_subsys.kobj;
 	return 0;

diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
@@ -217,7 +217,6 @@ extern struct kset hypervisor_subsys;
 #define kobj_set_kset_s(obj,subsys) \
 	(obj)->kobj.kset = &(subsys)
 
-extern void subsystem_init(struct kset *);
 extern int __must_check subsystem_register(struct kset *);
 extern void subsystem_unregister(struct kset *);
 

diff --git a/trunk/lib/kobject.c b/trunk/lib/kobject.c
@@ -617,11 +617,6 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name)
 	return ret;
 }
 
-void subsystem_init(struct kset *s)
-{
-	kset_init(s);
-}
-
 int subsystem_register(struct kset *s)
 {
 	return kset_register(s);