diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-03-24 18:49:53 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-03-27 12:50:11 -0400 |
commit | 44515374cba9e46d5622256b43eb06b9c349cee1 (patch) | |
tree | ef165c24ba7b0d6add3812fcfc56302a0acd1d25 /drivers/acpi/bus.c | |
parent | a5f820feb54a59fcdaf4a67a6381ea1ddb36cc6e (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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 9ca683794370..946610f00aa1 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -881,6 +881,7 @@ static int __init acpi_init(void) | |||
881 | 881 | ||
882 | acpi_scan_init(); | 882 | acpi_scan_init(); |
883 | acpi_ec_init(); | 883 | acpi_ec_init(); |
884 | acpi_power_init(); | ||
884 | return result; | 885 | return result; |
885 | } | 886 | } |
886 | 887 | ||