aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index c926e7d4a0d6..56665a63bf19 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -54,10 +54,6 @@ ACPI_MODULE_NAME("power");
54#define ACPI_POWER_RESOURCE_STATE_ON 0x01 54#define ACPI_POWER_RESOURCE_STATE_ON 0x01
55#define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF 55#define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
56 56
57#ifdef MODULE_PARAM_PREFIX
58#undef MODULE_PARAM_PREFIX
59#endif
60#define MODULE_PARAM_PREFIX "acpi."
61int acpi_power_nocheck; 57int acpi_power_nocheck;
62module_param_named(power_nocheck, acpi_power_nocheck, bool, 000); 58module_param_named(power_nocheck, acpi_power_nocheck, bool, 000);
63 59
@@ -773,14 +769,10 @@ static int acpi_power_resume(struct acpi_device *device)
773 return 0; 769 return 0;
774} 770}
775 771
776static int __init acpi_power_init(void) 772int __init acpi_power_init(void)
777{ 773{
778 int result = 0; 774 int result = 0;
779 775
780
781 if (acpi_disabled)
782 return 0;
783
784 INIT_LIST_HEAD(&acpi_power_resource_list); 776 INIT_LIST_HEAD(&acpi_power_resource_list);
785 777
786 acpi_power_dir = proc_mkdir(ACPI_POWER_CLASS, acpi_root_dir); 778 acpi_power_dir = proc_mkdir(ACPI_POWER_CLASS, acpi_root_dir);
@@ -795,5 +787,3 @@ static int __init acpi_power_init(void)
795 787
796 return 0; 788 return 0;
797} 789}
798
799subsys_initcall(acpi_power_init);