diff options
Diffstat (limited to 'drivers/acpi/debug.c')
-rw-r--r-- | drivers/acpi/debug.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c index 20223cbd0d1c..9cb189f3c77c 100644 --- a/drivers/acpi/debug.c +++ b/drivers/acpi/debug.c | |||
@@ -297,17 +297,15 @@ acpi_system_write_debug(struct file *file, | |||
297 | 297 | ||
298 | return count; | 298 | return count; |
299 | } | 299 | } |
300 | #endif | ||
300 | 301 | ||
301 | static int __init acpi_debug_init(void) | 302 | int __init acpi_debug_init(void) |
302 | { | 303 | { |
304 | #ifdef CONFIG_ACPI_PROCFS | ||
303 | struct proc_dir_entry *entry; | 305 | struct proc_dir_entry *entry; |
304 | int error = 0; | 306 | int error = 0; |
305 | char *name; | 307 | char *name; |
306 | 308 | ||
307 | |||
308 | if (acpi_disabled) | ||
309 | return 0; | ||
310 | |||
311 | /* 'debug_layer' [R/W] */ | 309 | /* 'debug_layer' [R/W] */ |
312 | name = ACPI_SYSTEM_FILE_DEBUG_LAYER; | 310 | name = ACPI_SYSTEM_FILE_DEBUG_LAYER; |
313 | entry = | 311 | entry = |
@@ -338,7 +336,7 @@ static int __init acpi_debug_init(void) | |||
338 | remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir); | 336 | remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir); |
339 | error = -ENODEV; | 337 | error = -ENODEV; |
340 | goto Done; | 338 | goto Done; |
341 | } | 339 | #else |
342 | 340 | return 0; | |
343 | subsys_initcall(acpi_debug_init); | ||
344 | #endif | 341 | #endif |
342 | } | ||