From f816d69d30dd2309ffc2b439a42da6aecff5a77e Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 24 Mar 2009 16:49:43 -0600
Subject: [PATCH] --- yaml --- r: 141876 b: refs/heads/master c:
 e747f274951507b5a0850155c3d709e26d20de5b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 53ac119ec6a9..e9e80029da9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81d0273df20edff275e2eefe6b50436af3bdf9e8
+refs/heads/master: e747f274951507b5a0850155c3d709e26d20de5b
diff --git a/trunk/drivers/acpi/bus.c b/trunk/drivers/acpi/bus.c
index bdeed39c3d38..cdd11fda5036 100644
--- a/trunk/drivers/acpi/bus.c
+++ b/trunk/drivers/acpi/bus.c
@@ -878,6 +878,8 @@ static int __init acpi_init(void)
 	 * will be disabled in the course of device power transistion.
 	 */
 	dmi_check_system(power_nocheck_dmi_table);
+
+	acpi_scan_init();
 	return result;
 }
 
diff --git a/trunk/drivers/acpi/internal.h b/trunk/drivers/acpi/internal.h
index 4aee4a236fc9..28042c0f2fff 100644
--- a/trunk/drivers/acpi/internal.h
+++ b/trunk/drivers/acpi/internal.h
@@ -1,5 +1,7 @@
 /* For use by Linux/ACPI infrastructure, not drivers */
 
+int acpi_scan_init(void);
+
 /* --------------------------------------------------------------------------
                                   Power Resource
    -------------------------------------------------------------------------- */
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 2f04cd1147e9..c548231965ef 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -1526,16 +1526,11 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
 	return result;
 }
 
-
-static int __init acpi_scan_init(void)
+int __init acpi_scan_init(void)
 {
 	int result;
 	struct acpi_bus_ops ops;
 
-
-	if (acpi_disabled)
-		return 0;
-
 	memset(&ops, 0, sizeof(ops));
 	ops.acpi_op_add = 1;
 	ops.acpi_op_start = 1;
@@ -1568,5 +1563,3 @@ static int __init acpi_scan_init(void)
       Done:
 	return result;
 }
-
-subsys_initcall(acpi_scan_init);