---

yaml --- r: 230897 b: refs/heads/master c: 97d9a9e h: refs/heads/master i: 230895: 7afe0d9 v: v3
git-mirror · Jan 12, 2011 · f659421 · f659421
1 parent abd89f3
commit f659421
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25eed40720fc9005c63a1f436e5f8a78836c26ff
+refs/heads/master: 97d9a9e9f5ee68f20005ca5aa77c6b684e7cace8
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
@@ -1099,7 +1099,6 @@ static int __init acpi_init(void)
 
 	acpi_scan_init();
 	acpi_ec_init();
-	acpi_power_init();
 	acpi_debugfs_init();
 	acpi_sleep_proc_init();
 	acpi_wakeup_device_init();

diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
@@ -1570,6 +1570,8 @@ int __init acpi_scan_init(void)
 		printk(KERN_ERR PREFIX "Could not register bus type\n");
 	}
 
+	acpi_power_init();
+
 	/*
 	 * Enumerate devices in the ACPI namespace.
 	 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -1570,6 +1570,8 @@ int __init acpi_scan_init(void) @@
     		printk(KERN_ERR PREFIX "Could not register bus type\n");
     	}
+    	acpi_power_init();
     	/*
     	 * Enumerate devices in the ACPI namespace.
     	 */
@@ Expand Down @@