diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
| commit | 9a38f4eec57cc5104b6a85bc6d0a91b268fbe803 (patch) | |
| tree | da01b5dd92d4076878003a8886fc2c9265e578f5 /drivers/acpi/proc.c | |
| parent | 67dc092187626ac55a60877485f78bc291cbfa81 (diff) | |
| parent | 018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f (diff) | |
Merge branch 'bjorn-initcall-cleanup' into release
Diffstat (limited to 'drivers/acpi/proc.c')
| -rw-r--r-- | drivers/acpi/proc.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index 428c911dba08..05dfdc96802e 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c @@ -496,11 +496,8 @@ static u32 rtc_handler(void *context) } #endif /* HAVE_ACPI_LEGACY_ALARM */ -static int __init acpi_sleep_proc_init(void) +int __init acpi_sleep_proc_init(void) { - if (acpi_disabled) - return 0; - #ifdef CONFIG_ACPI_PROCFS /* 'sleep' [R/W] */ proc_create("sleep", S_IFREG | S_IRUGO | S_IWUSR, @@ -527,5 +524,3 @@ static int __init acpi_sleep_proc_init(void) return 0; } - -late_initcall(acpi_sleep_proc_init); |