Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux

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

diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index 9efff481f5dc4a50e0209ea15119596328fea017..11381555680943616bbc82a734f4e0e860ee5024 100644 (file)
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -15,13 +15,13 @@
 
 #include "base.h"
 
-struct kset *firmware_kset;
-EXPORT_SYMBOL_GPL(firmware_kset);
+struct kobject *firmware_kobj;
+EXPORT_SYMBOL_GPL(firmware_kobj);
 
 int __init firmware_init(void)
 {
-       firmware_kset = kset_create_and_add("firmware", NULL, NULL);
-       if (!firmware_kset)
+       firmware_kobj = kobject_create_and_add("firmware", NULL);
+       if (!firmware_kobj)
                return -ENOMEM;
        return 0;
 }