diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/bus.c | 11 | ||||
-rw-r--r-- | drivers/acpi/system.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 7c172d9d7acf..e550da684a47 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -743,7 +743,7 @@ static int __init acpi_bus_init(void) | |||
743 | return -ENODEV; | 743 | return -ENODEV; |
744 | } | 744 | } |
745 | 745 | ||
746 | decl_subsys(acpi, NULL); | 746 | struct kobject *acpi_kobj; |
747 | 747 | ||
748 | static int __init acpi_init(void) | 748 | static int __init acpi_init(void) |
749 | { | 749 | { |
@@ -755,10 +755,11 @@ static int __init acpi_init(void) | |||
755 | return -ENODEV; | 755 | return -ENODEV; |
756 | } | 756 | } |
757 | 757 | ||
758 | result = firmware_register(&acpi_subsys); | 758 | acpi_kobj = kobject_create_and_add("acpi", &firmware_kset->kobj); |
759 | if (result < 0) | 759 | if (!acpi_kobj) { |
760 | printk(KERN_WARNING "%s: firmware_register error: %d\n", | 760 | printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__); |
761 | __FUNCTION__, result); | 761 | acpi_kobj = NULL; |
762 | } | ||
762 | 763 | ||
763 | result = acpi_bus_init(); | 764 | result = acpi_bus_init(); |
764 | 765 | ||
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index edee2806e37b..c22b93aab7fe 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
@@ -135,7 +135,7 @@ static int acpi_system_sysfs_init(void) | |||
135 | int table_index = 0; | 135 | int table_index = 0; |
136 | int result; | 136 | int result; |
137 | 137 | ||
138 | tables_kobj.parent = &acpi_subsys.kobj; | 138 | tables_kobj.parent = acpi_kobj; |
139 | kobject_set_name(&tables_kobj, "tables"); | 139 | kobject_set_name(&tables_kobj, "tables"); |
140 | result = kobject_register(&tables_kobj); | 140 | result = kobject_register(&tables_kobj); |
141 | if (result) | 141 | if (result) |