1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index f4487c38d9f2..1b4cf984b081 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -743,7 +743,7 @@ static int __init acpi_bus_init(void)
         return -ENODEV;
 }
 
-decl_subsys(acpi, NULL, NULL);
+struct kobject *acpi_kobj;
 
 static int __init acpi_init(void)
 {
@@ -755,10 +755,11 @@ static int __init acpi_init(void)
                 return -ENODEV;
         }
 
-        result = firmware_register(&acpi_subsys);
-        if (result < 0)
-                printk(KERN_WARNING "%s: firmware_register error: %d\n",
-                        __FUNCTION__, result);
+        acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);
+        if (!acpi_kobj) {
+                printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__);
+                acpi_kobj = NULL;
+        }
 
         result = acpi_bus_init();