aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/class.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base/class.c')
-rw-r--r--drivers/base/class.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 61fd26cc9f0e..b962a76875d2 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -466,7 +466,6 @@ static struct kset_uevent_ops class_uevent_ops = {
466 * entirely soon. 466 * entirely soon.
467 */ 467 */
468static struct kset class_obj_subsys = { 468static struct kset class_obj_subsys = {
469 .kobj = { .k_name = "class_obj", },
470 .uevent_ops = &class_uevent_ops, 469 .uevent_ops = &class_uevent_ops,
471}; 470};
472 471
@@ -872,6 +871,7 @@ int __init classes_init(void)
872 /* ick, this is ugly, the things we go through to keep from showing up 871 /* ick, this is ugly, the things we go through to keep from showing up
873 * in sysfs... */ 872 * in sysfs... */
874 kset_init(&class_obj_subsys); 873 kset_init(&class_obj_subsys);
874 kobject_set_name(&class_obj_subsys.kobj, "class_obj");
875 if (!class_obj_subsys.kobj.parent) 875 if (!class_obj_subsys.kobj.parent)
876 class_obj_subsys.kobj.parent = &class_obj_subsys.kobj; 876 class_obj_subsys.kobj.parent = &class_obj_subsys.kobj;
877 return 0; 877 return 0;