This commit was manufactured by cvs2svn to create tag

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

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 1b6eff5..54ae84d 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -70,11 +70,9 @@ acpi_status
 acpi_terminate (
        void);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_subsystem_status (
        void);
-#endif
 
 acpi_status
 acpi_enable (
@@ -84,11 +82,9 @@ acpi_status
 acpi_disable (
        void);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_get_system_info (
        struct acpi_buffer              *ret_buffer);
-#endif
 
 const char *
 acpi_format_exception (
@@ -98,12 +94,10 @@ acpi_status
 acpi_purge_cached_objects (
        void);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_install_initialization_handler (
        acpi_init_handler               handler,
        u32                             function);
-#endif
 
 /*
  * ACPI Memory manager
@@ -135,7 +129,6 @@ acpi_status
 acpi_load_tables (
        void);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_load_table (
        struct acpi_table_header        *table_ptr);
@@ -149,7 +142,6 @@ acpi_get_table_header (
        acpi_table_type                 table_type,
        u32                             instance,
        struct acpi_table_header        *out_table_header);
-#endif  /*  ACPI_FUTURE_USAGE  */
 
 acpi_status
 acpi_get_table (
@@ -226,7 +218,6 @@ acpi_evaluate_object (
        struct acpi_object_list         *parameter_objects,
        struct acpi_buffer              *return_object_buffer);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_evaluate_object_typed (
        acpi_handle                     object,
@@ -234,7 +225,6 @@ acpi_evaluate_object_typed (
        struct acpi_object_list         *external_params,
        struct acpi_buffer              *return_buffer,
        acpi_object_type                return_type);
-#endif
 
 acpi_status
 acpi_get_object_info (
@@ -309,17 +299,6 @@ acpi_install_gpe_handler (
        acpi_event_handler              address,
        void                            *context);
 
-#ifdef ACPI_FUTURE_USAGE
-acpi_status
-acpi_install_exception_handler (
-       acpi_exception_handler          handler);
-#endif
-
-
-/*
- * Event interfaces
- */
-
 acpi_status
 acpi_acquire_global_lock (
        u16                             timeout,
@@ -345,7 +324,6 @@ acpi_disable_event (
        u32                             event,
        u32                             flags);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_clear_event (
        u32                             event);
@@ -354,7 +332,6 @@ acpi_status
 acpi_get_event_status (
        u32                             event,
        acpi_event_status               *event_status);
-#endif  /*  ACPI_FUTURE_USAGE  */
 
 acpi_status
 acpi_set_gpe_type (
@@ -380,14 +357,12 @@ acpi_clear_gpe (
        u32                             gpe_number,
        u32                             flags);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_get_gpe_status (
        acpi_handle                     gpe_device,
        u32                             gpe_number,
        u32                             flags,
        acpi_event_status               *event_status);
-#endif  /*  ACPI_FUTURE_USAGE  */
 
 acpi_status
 acpi_install_gpe_block (
@@ -416,12 +391,10 @@ acpi_get_current_resources(
        acpi_handle                     device_handle,
        struct acpi_buffer              *ret_buffer);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_get_possible_resources(
        acpi_handle                     device_handle,
        struct acpi_buffer              *ret_buffer);
-#endif
 
 acpi_status
 acpi_walk_resources (
@@ -465,11 +438,9 @@ acpi_status
 acpi_set_firmware_waking_vector (
        acpi_physical_address           physical_address);
 
-#ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_get_firmware_waking_vector (
        acpi_physical_address           *physical_address);
-#endif
 
 acpi_status
 acpi_get_sleep_type_data (