summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/internal.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-03-24 23:50:03 +0100
committerLen Brown <len.brown@intel.com>2009-03-27 17:50:29 +0100
commit84f810c33f695e020776ce66c903e0b41872f1b2 (patch)
tree31d0bf813d353e3a8d97638f8694d5edd86f1419 /drivers/acpi/internal.h
parentACPI: call acpi_system_init() explicitly rather than as initcall (diff)
downloadlinux-84f810c33f695e020776ce66c903e0b41872f1b2.tar.xz
linux-84f810c33f695e020776ce66c903e0b41872f1b2.zip
ACPI: call acpi_debug_init() explicitly rather than as initcall
This patch makes acpi_init() call acpi_debug_init() directly. Previously, both were subsys_initcalls. acpi_debug_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/internal.h')
-rw-r--r--drivers/acpi/internal.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 4a35f6e819d3..44b84021d84d 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -3,6 +3,12 @@
int acpi_scan_init(void);
int acpi_system_init(void);
+#ifdef CONFIG_ACPI_DEBUG
+int acpi_debug_init(void);
+#else
+static inline int acpi_debug_init(void) { return 0; }
+#endif
+
/* --------------------------------------------------------------------------
Power Resource
-------------------------------------------------------------------------- */