Merge branch 'dynamic-ssdt' into release

[linux-2.6-omap-h63xx.git] / drivers / acpi / system.c

diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index c8859047acfe0e0dd9cfcef34ea08e6276bea082..44be75ee7264dfaf64bf985dab67979d9ce04602 100644 (file)
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -616,12 +616,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)
@@ -631,5 +628,3 @@ static int __init acpi_system_init(void)
 
        return result;
 }
-
-subsys_initcall(acpi_system_init);