From 3f3b1e747ac08c9cde279df541f95474bb729f11 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 24 Mar 2009 16:49:58 -0600
Subject: [PATCH] --- yaml --- r: 141879 b: refs/heads/master c:
 141a0af3cab7de690816b17aad1682050219f774 h: refs/heads/master i:   141877:
 9513fe1e4f9cf4c9d2c604bc43ab4425466d71ba   141875:
 6d3dae38d3fc38d9aeb2a5548fb060e3924afe4f   141871:
 3f64fb067beea44ab6ad10e13dd7e08e4c2b2337 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/acpi/bus.c      | 1 +
 trunk/drivers/acpi/internal.h | 1 +
 trunk/drivers/acpi/system.c   | 9 ++-------
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f1a2a5c946be..58a986b3fade 100644
--- 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
index 946610f00aa1..c13307279f7e 100644
--- 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
index a8178add7fd1..4a35f6e819d3 100644
--- 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
index 391d0358a592..3b88981dd215 100644
--- 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);