Merge branch 'gpe-regression-fixes' into release

[mv-sheeva.git] / include / acpi / actypes.h

diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 15a4c68fad3b70eb6bfe96ada898841313221ecf..d55f4a7b824db550d3ce2bfbd2c7235859eb08a4 100644 (file)
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -952,7 +952,7 @@ acpi_status(*acpi_adr_space_setup) (acpi_handle region_handle,
 #define ACPI_REGION_DEACTIVATE  1
 
 typedef
-acpi_status(*acpi_walk_callback) (acpi_handle obj_handle,
+acpi_status(*acpi_walk_callback) (acpi_handle object,
                                  u32 nesting_level,
                                  void *context, void **return_value);