diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-03-24 23:49:58 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-03-27 17:50:19 +0100 |
| commit | 141a0af3cab7de690816b17aad1682050219f774 (patch) | |
| tree | 1b2026b63b879e65a5b347115554064d4df633bb /drivers/acpi/system.c | |
| parent | ACPI: call acpi_power_init() explicitly rather than as initcall (diff) | |
| download | linux-141a0af3cab7de690816b17aad1682050219f774.tar.xz linux-141a0af3cab7de690816b17aad1682050219f774.zip | |
ACPI: call acpi_system_init() explicitly rather than as initcall
This patch makes acpi_init() call acpi_system_init() directly.
Previously, both were subsys_initcalls. acpi_system_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>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/system.c')
| -rw-r--r-- | drivers/acpi/system.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index 391d0358a592..3b88981dd215 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c @@ -571,12 +571,9 @@ static int acpi_system_procfs_init(void) } #endif -static int __init acpi_system_init(void) +int __init acpi_system_init(void) { - int result = 0; - - if (acpi_disabled) - return 0; + int result; result = acpi_system_procfs_init(); if (result) @@ -586,5 +583,3 @@ static int __init acpi_system_init(void) return result; } - -subsys_initcall(acpi_system_init); |