Merge branch 'dell-wmi' into release

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

diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c
index c483968920085f13da610c387fd685ebe07ca654..a8287be0870e7bc06d7dc21963c32e0996a6e623 100644 (file)
--- a/drivers/acpi/debug.c
+++ b/drivers/acpi/debug.c
@@ -9,16 +9,10 @@
 #include <linux/moduleparam.h>
 #include <asm/uaccess.h>
 #include <acpi/acpi_drivers.h>
-#include <acpi/acglobal.h>
 
 #define _COMPONENT             ACPI_SYSTEM_COMPONENT
 ACPI_MODULE_NAME("debug");
 
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
-
 struct acpi_dlayer {
        const char *name;
        unsigned long value;
@@ -298,17 +292,15 @@ acpi_system_write_debug(struct file *file,
 
        return count;
 }
+#endif
 
-static int __init acpi_debug_init(void)
+int __init acpi_debug_init(void)
 {
+#ifdef CONFIG_ACPI_PROCFS
        struct proc_dir_entry *entry;
        int error = 0;
        char *name;
 
-
-       if (acpi_disabled)
-               return 0;
-
        /* 'debug_layer' [R/W] */
        name = ACPI_SYSTEM_FILE_DEBUG_LAYER;
        entry =
@@ -339,7 +331,7 @@ static int __init acpi_debug_init(void)
        remove_proc_entry(ACPI_SYSTEM_FILE_DEBUG_LAYER, acpi_root_dir);
        error = -ENODEV;
        goto Done;
-}
-
-subsys_initcall(acpi_debug_init);
+#else
+       return 0;
 #endif
+}