This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/acpi/acdispat.h b/include/acpi/acdispat.h
index a47a162..e003a4f 100644 (file)
--- a/include/acpi/acdispat.h
+++ b/include/acpi/acdispat.h
@@ -62,12 +62,10 @@ acpi_ds_obj_stack_pop (
        u32                             pop_count,
        struct acpi_walk_state          *walk_state);
 
-#ifdef ACPI_FUTURE_USAGE
 void *
 acpi_ds_obj_stack_get_value (
        u32                             index,
        struct acpi_walk_state          *walk_state);
-#endif
 
 acpi_status
 acpi_ds_obj_stack_pop_object (
@@ -250,13 +248,11 @@ u8
 acpi_ds_is_method_value (
        union acpi_operand_object       *obj_desc);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_object_type
 acpi_ds_method_data_get_type (
        u16                             opcode,
        u32                             index,
        struct acpi_walk_state          *walk_state);
-#endif
 
 acpi_status
 acpi_ds_method_data_get_value (
@@ -444,11 +440,9 @@ acpi_ds_init_aml_walk (
        struct acpi_parameter_info      *info,
        u32                             pass_number);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_ds_obj_stack_delete_all (
        struct acpi_walk_state          *walk_state);
-#endif
 
 acpi_status
 acpi_ds_obj_stack_pop_and_delete (
@@ -488,7 +482,6 @@ void
 acpi_ds_delete_walk_state_cache (
        void);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_ds_result_insert (
        void                            *object,
@@ -500,7 +493,6 @@ acpi_ds_result_remove (
        union acpi_operand_object       **object,
        u32                             index,
        struct acpi_walk_state          *walk_state);
-#endif
 
 acpi_status
 acpi_ds_result_pop (