---

yaml --- r: 75750 b: refs/heads/master c: b0d78e5 h: refs/heads/master v: v3
git-mirror · Jan 25, 2008 · b4ef401 · b4ef401
1 parent 4c3e14c
commit b4ef401
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 443dbf9007854ef2892226615e23b60a35b89697
+refs/heads/master: b0d78e5549b44b3d64bf8b3ffe95280025ed102e
diff --git a/trunk/drivers/base/firmware.c b/trunk/drivers/base/firmware.c
@@ -15,11 +15,11 @@
 
 #include "base.h"
 
-static decl_subsys(firmware, NULL);
+static struct kset *firmware_kset;
 
 int firmware_register(struct kset *s)
 {
-	s->kobj.kset = &firmware_subsys;
+	s->kobj.kset = firmware_kset;
 	s->kobj.ktype = NULL;
 	return subsystem_register(s);
 }
@@ -31,7 +31,10 @@ void firmware_unregister(struct kset *s)
 
 int __init firmware_init(void)
 {
-	return subsystem_register(&firmware_subsys);
+	firmware_kset = kset_create_and_add("firmware", NULL, NULL);
+	if (!firmware_kset)
+		return -ENOMEM;
+	return 0;
 }
 
 EXPORT_SYMBOL_GPL(firmware_register);