aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/bus.c1
-rw-r--r--drivers/acpi/scan.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 19decee72e92..47864013c0df 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1099,7 +1099,6 @@ static int __init acpi_init(void)
1099 1099
1100 acpi_scan_init(); 1100 acpi_scan_init();
1101 acpi_ec_init(); 1101 acpi_ec_init();
1102 acpi_power_init();
1103 acpi_debugfs_init(); 1102 acpi_debugfs_init();
1104 acpi_sleep_proc_init(); 1103 acpi_sleep_proc_init();
1105 acpi_wakeup_device_init(); 1104 acpi_wakeup_device_init();
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index ef8e659771e1..2951a27303cb 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1570,6 +1570,8 @@ int __init acpi_scan_init(void)
1570 printk(KERN_ERR PREFIX "Could not register bus type\n"); 1570 printk(KERN_ERR PREFIX "Could not register bus type\n");
1571 } 1571 }
1572 1572
1573 acpi_power_init();
1574
1573 /* 1575 /*
1574 * Enumerate devices in the ACPI namespace. 1576 * Enumerate devices in the ACPI namespace.
1575 */ 1577 */