This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / acpi / acnamesp.h

diff --git a/include/acpi/acnamesp.h b/include/acpi/acnamesp.h
index f0a34ef..8cfd1af 100644 (file)
--- a/include/acpi/acnamesp.h
+++ b/include/acpi/acnamesp.h
@@ -210,7 +210,6 @@ acpi_ns_remove_reference (
  * Namespace modification - nsmodify
  */
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_ns_unload_namespace (
        acpi_handle                     handle);
@@ -218,19 +217,16 @@ acpi_ns_unload_namespace (
 acpi_status
 acpi_ns_delete_subtree (
        acpi_handle                     start_handle);
-#endif
 
 
 /*
  * Namespace dump/print utilities - nsdump
  */
 
-#ifdef ACPI_FUTURE_USAGE
 void
 acpi_ns_dump_tables (
        acpi_handle                     search_base,
        u32                             max_depth);
-#endif
 
 void
 acpi_ns_dump_entry (
@@ -249,7 +245,6 @@ acpi_ns_print_pathname (
        u32                             num_segments,
        char                            *pathname);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_ns_dump_one_device (
        acpi_handle                     obj_handle,
@@ -260,7 +255,6 @@ acpi_ns_dump_one_device (
 void
 acpi_ns_dump_root_devices (
        void);
-#endif  /*  ACPI_FUTURE_USAGE  */
 
 acpi_status
 acpi_ns_dump_one_object (
@@ -269,7 +263,6 @@ acpi_ns_dump_one_object (
        void                            *context,
        void                            **return_value);
 
-#ifdef ACPI_FUTURE_USAGE
 void
 acpi_ns_dump_objects (
        acpi_object_type                type,
@@ -277,7 +270,6 @@ acpi_ns_dump_objects (
        u32                             max_depth,
        u32                             ownder_id,
        acpi_handle                     start_handle);
-#endif
 
 
 /*
@@ -311,11 +303,9 @@ acpi_ns_get_object_value (
  * Parent/Child/Peer utility functions
  */
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_name
 acpi_ns_find_parent_name (
        struct acpi_namespace_node      *node_to_search);
-#endif
 
 
 /*