From b4ef4016ae88d3debe114c55a7827c5217b90c4d Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 29 Oct 2007 23:22:26 -0500
Subject: [PATCH] --- yaml --- r: 75750 b: refs/heads/master c:
 b0d78e5549b44b3d64bf8b3ffe95280025ed102e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/base/firmware.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9fc61c2a84b4..b18a892c5c0a 100644
--- 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
index 336be0450d54..6a4e494042f6 100644
--- 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);