vserver 1.9.5.x5

[linux-2.6.git] / drivers / acpi / namespace / nsload.c

diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index 314ec66..1d7aedf 100644 (file)
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2004, R. Byron Moore
+ * Copyright (C) 2000 - 2005, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,12 +92,14 @@ acpi_ns_load_table (
                return_ACPI_STATUS (AE_BAD_PARAMETER);
        }
 
-       ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "AML block at %p\n", table_desc->aml_start));
+       ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "AML block at %p\n",
+               table_desc->aml_start));
 
        /* Ignore table if there is no AML contained within */
 
        if (!table_desc->aml_length) {
-               ACPI_REPORT_WARNING (("Zero-length AML block in table [%4.4s]\n", table_desc->pointer->signature));
+               ACPI_REPORT_WARNING (("Zero-length AML block in table [%4.4s]\n",
+                       table_desc->pointer->signature));
                return_ACPI_STATUS (AE_OK);
        }
 
@@ -110,7 +112,8 @@ acpi_ns_load_table (
         * to another control method, we can't continue parsing
         * because we don't know how many arguments to parse next!
         */
-       ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "**** Loading table into namespace ****\n"));
+       ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+               "**** Loading table into namespace ****\n"));
 
        status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
        if (ACPI_FAILURE (status)) {
@@ -196,7 +199,6 @@ acpi_ns_load_table_by_type (
                if (ACPI_SUCCESS (status)) {
                        table_desc->loaded_into_namespace = TRUE;
                }
-
                break;
 
 
@@ -252,7 +254,6 @@ acpi_ns_load_table_by_type (
 
                        table_desc = table_desc->next;
                }
-
                break;
 
 
@@ -320,6 +321,8 @@ acpi_ns_load_namespace (
 }
 
 
+#ifdef ACPI_FUTURE_USAGE
+
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ns_delete_subtree
@@ -451,5 +454,7 @@ acpi_ns_unload_namespace (
        return_ACPI_STATUS (status);
 }
 
+#endif  /*  ACPI_FUTURE_USAGE  */
+
 #endif