diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 05:38:31 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 05:38:31 (GMT) |
commit | 9a38f4eec57cc5104b6a85bc6d0a91b268fbe803 (patch) | |
tree | da01b5dd92d4076878003a8886fc2c9265e578f5 /drivers/acpi/bus.c | |
parent | 67dc092187626ac55a60877485f78bc291cbfa81 (diff) | |
parent | 018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f (diff) | |
download | linux-9a38f4eec57cc5104b6a85bc6d0a91b268fbe803.tar.xz |
Merge branch 'bjorn-initcall-cleanup' into release
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r-- | drivers/acpi/bus.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index bee64b7..e8f7b64 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -39,6 +39,8 @@ #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> +#include "internal.h" + #define _COMPONENT ACPI_BUS_COMPONENT ACPI_MODULE_NAME("bus"); @@ -846,6 +848,7 @@ static int __init acpi_init(void) acpi_kobj = NULL; } + init_acpi_device_notify(); result = acpi_bus_init(); if (!result) { @@ -860,11 +863,23 @@ static int __init acpi_init(void) } } else disable_acpi(); + + if (acpi_disabled) + return result; + /* * If the laptop falls into the DMI check table, the power state check * will be disabled in the course of device power transistion. */ dmi_check_system(power_nocheck_dmi_table); + + acpi_scan_init(); + acpi_ec_init(); + acpi_power_init(); + acpi_system_init(); + acpi_debug_init(); + acpi_sleep_proc_init(); + acpi_wakeup_device_init(); return result; } |