aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/acpi/bus.c1
-rw-r--r--drivers/acpi/internal.h1
-rw-r--r--drivers/acpi/system.c9
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 946610f00aa..c13307279f7 100644
--- a/drivers/acpi/bus.c
+++ b/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/drivers/acpi/internal.h b/drivers/acpi/internal.h
index a8178add7fd..4a35f6e819d 100644
--- a/drivers/acpi/internal.h
+++ b/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/drivers/acpi/system.c b/drivers/acpi/system.c
index 391d0358a59..3b88981dd21 100644
--- a/drivers/acpi/system.c
+++ b/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);