aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/internal.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-03-24 18:49:43 -0400
committerLen Brown <len.brown@intel.com>2009-03-27 12:49:47 -0400
commite747f274951507b5a0850155c3d709e26d20de5b (patch)
tree2c9e02cd94dc592d1fe918da2a9b1e50e3fa0efa /drivers/acpi/internal.h
parent81d0273df20edff275e2eefe6b50436af3bdf9e8 (diff)
ACPI: call acpi_scan_init() explicitly rather than as initcall
This patch makes acpi_init() call acpi_scan_init() directly. Previously, both acpi_init() and acpi_scan_init() were subsys_initcalls, and acpi_init() was called first based on the link order from the makefile (bus.o before scan.o). acpi_scan_init() registers the ACPI bus type, creates the root device, and enumerates fixed-feature and namespace devices. All of this must be done after acpi_init(), and it's better to call acpi_scan_init() explicitly rather than rely on the 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/internal.h')
-rw-r--r--drivers/acpi/internal.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 4aee4a236fc9..28042c0f2fff 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -1,5 +1,7 @@
1/* For use by Linux/ACPI infrastructure, not drivers */ 1/* For use by Linux/ACPI infrastructure, not drivers */
2 2
3int acpi_scan_init(void);
4
3/* -------------------------------------------------------------------------- 5/* --------------------------------------------------------------------------
4 Power Resource 6 Power Resource
5 -------------------------------------------------------------------------- */ 7 -------------------------------------------------------------------------- */