kobject: get rid of kobject_kset_add_dir

[linux-2.6] / drivers / base / firmware.c

diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index 90c8629321698b8a697d84b47f04eb67ded96b89..336be0450d54943e662c967ec1a2b0b515f8f0d6 100644 (file)
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -15,11 +15,12 @@
 
 #include "base.h"
 
-static decl_subsys(firmware, NULL, NULL);
+static decl_subsys(firmware, NULL);
 
 int firmware_register(struct kset *s)
 {
-       kobj_set_kset_s(s, firmware_subsys);
+       s->kobj.kset = &firmware_subsys;
+       s->kobj.ktype = NULL;
        return subsystem_register(s);
 }