---

yaml --- r: 141879 b: refs/heads/master c: 141a0af h: refs/heads/master i: 141877: 9513fe1 141875: 6d3dae3 141871: 3f64fb0 v: v3
git-mirror · Mar 27, 2009 · 3f3b1e7 · 3f3b1e7
1 parent aee7fb4
commit 3f3b1e7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44515374cba9e46d5622256b43eb06b9c349cee1
+refs/heads/master: 141a0af3cab7de690816b17aad1682050219f774
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
@@ -882,6 +882,7 @@ static int __init acpi_init(void)
 	acpi_scan_init();
 	acpi_ec_init();
 	acpi_power_init();
+	acpi_system_init();
 	return result;
 }
 

diff --git a/trunk/drivers/acpi/internal.h b/trunk/drivers/acpi/internal.h
@@ -1,6 +1,7 @@
 /* For use by Linux/ACPI infrastructure, not drivers */
 
 int acpi_scan_init(void);
+int acpi_system_init(void);
 
 /* --------------------------------------------------------------------------
                                   Power Resource

diff --git a/trunk/drivers/acpi/system.c b/trunk/drivers/acpi/system.c
@@ -571,12 +571,9 @@ static int acpi_system_procfs_init(void)
 }
 #endif
 
-static int __init acpi_system_init(void)
+int __init acpi_system_init(void)
 {
-	int result = 0;
-
-	if (acpi_disabled)
-		return 0;
+	int result;
 
 	result = acpi_system_procfs_init();
 	if (result)
@@ -586,5 +583,3 @@ static int __init acpi_system_init(void)
 
 	return result;
 }
-
-subsys_initcall(acpi_system_init);