aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/bus.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-03-24 16:49:53 -0600
committerLen Brown <len.brown@intel.com>2009-03-27 12:50:11 -0400
commit44515374cba9e46d5622256b43eb06b9c349cee1 (patch)
treeef165c24ba7b0d6add3812fcfc56302a0acd1d25 /drivers/acpi/bus.c
parenta5f820feb54a59fcdaf4a67a6381ea1ddb36cc6e (diff)
ACPI: call acpi_power_init() explicitly rather than as initcall
This patch makes acpi_init() call acpi_power_init() directly. Previously, both were subsys_initcalls. acpi_power_init() must happen after acpi_init(), and it's better to call it explicitly rather than rely on link ordering. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> CC: Zhao Yakui <yakui.zhao@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r--drivers/acpi/bus.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 9ca68379437..946610f00aa 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -881,6 +881,7 @@ static int __init acpi_init(void)
acpi_scan_init();
acpi_ec_init();
+ acpi_power_init();
return result;
}