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 cb1b98ae0d5830f7006de43fe7b4a004a6f4a3a5..336be0450d54943e662c967ec1a2b0b515f8f0d6 100644 (file)
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -15,15 +15,16 @@
 
 #include "base.h"
 
-static decl_subsys(firmware, NULL, NULL);
+static decl_subsys(firmware, NULL);
 
-int firmware_register(struct subsystem * s)
+int firmware_register(struct kset *s)
 {
-       kset_set_kset_s(s, firmware_subsys);
+       s->kobj.kset = &firmware_subsys;
+       s->kobj.ktype = NULL;
        return subsystem_register(s);
 }
 
-void firmware_unregister(struct subsystem * s)
+void firmware_unregister(struct kset *s)
 {
        subsystem_unregister(s);
 }