diff options
Diffstat (limited to 'drivers/acpi/acpica/aclocal.h')
-rw-r--r-- | drivers/acpi/acpica/aclocal.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index c816ee675094..ff8bd0061e8b 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h | |||
@@ -262,10 +262,10 @@ struct acpi_create_field_info { | |||
262 | }; | 262 | }; |
263 | 263 | ||
264 | typedef | 264 | typedef |
265 | acpi_status(*ACPI_INTERNAL_METHOD) (struct acpi_walk_state * walk_state); | 265 | acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state); |
266 | 266 | ||
267 | /* | 267 | /* |
268 | * Bitmapped ACPI types. Used internally only | 268 | * Bitmapped ACPI types. Used internally only |
269 | */ | 269 | */ |
270 | #define ACPI_BTYPE_ANY 0x00000000 | 270 | #define ACPI_BTYPE_ANY 0x00000000 |
271 | #define ACPI_BTYPE_INTEGER 0x00000001 | 271 | #define ACPI_BTYPE_INTEGER 0x00000001 |
@@ -486,8 +486,10 @@ struct acpi_gpe_device_info { | |||
486 | struct acpi_namespace_node *gpe_device; | 486 | struct acpi_namespace_node *gpe_device; |
487 | }; | 487 | }; |
488 | 488 | ||
489 | typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *gpe_xrupt_info, | 489 | typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info * |
490 | struct acpi_gpe_block_info *gpe_block, void *context); | 490 | gpe_xrupt_info, |
491 | struct acpi_gpe_block_info *gpe_block, | ||
492 | void *context); | ||
491 | 493 | ||
492 | /* Information about each particular fixed event */ | 494 | /* Information about each particular fixed event */ |
493 | 495 | ||
@@ -582,7 +584,7 @@ struct acpi_pscope_state { | |||
582 | }; | 584 | }; |
583 | 585 | ||
584 | /* | 586 | /* |
585 | * Thread state - one per thread across multiple walk states. Multiple walk | 587 | * Thread state - one per thread across multiple walk states. Multiple walk |
586 | * states are created when there are nested control methods executing. | 588 | * states are created when there are nested control methods executing. |
587 | */ | 589 | */ |
588 | struct acpi_thread_state { | 590 | struct acpi_thread_state { |
@@ -645,7 +647,7 @@ union acpi_generic_state { | |||
645 | * | 647 | * |
646 | ****************************************************************************/ | 648 | ****************************************************************************/ |
647 | 649 | ||
648 | typedef acpi_status(*ACPI_EXECUTE_OP) (struct acpi_walk_state * walk_state); | 650 | typedef acpi_status(*acpi_execute_op) (struct acpi_walk_state * walk_state); |
649 | 651 | ||
650 | /* Address Range info block */ | 652 | /* Address Range info block */ |
651 | 653 | ||
@@ -1031,6 +1033,7 @@ struct acpi_db_method_info { | |||
1031 | acpi_handle method; | 1033 | acpi_handle method; |
1032 | acpi_handle main_thread_gate; | 1034 | acpi_handle main_thread_gate; |
1033 | acpi_handle thread_complete_gate; | 1035 | acpi_handle thread_complete_gate; |
1036 | acpi_handle info_gate; | ||
1034 | acpi_thread_id *threads; | 1037 | acpi_thread_id *threads; |
1035 | u32 num_threads; | 1038 | u32 num_threads; |
1036 | u32 num_created; | 1039 | u32 num_created; |
@@ -1041,6 +1044,7 @@ struct acpi_db_method_info { | |||
1041 | u32 num_loops; | 1044 | u32 num_loops; |
1042 | char pathname[128]; | 1045 | char pathname[128]; |
1043 | char **args; | 1046 | char **args; |
1047 | acpi_object_type *types; | ||
1044 | 1048 | ||
1045 | /* | 1049 | /* |
1046 | * Arguments to be passed to method for the command | 1050 | * Arguments to be passed to method for the command |