merge linus into release branch

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

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 66cf2ecef57a1264959c09aef7844f8ffed8a68a..049e9aa1b8678e827b201ebc9eb22cf269dc11d6 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -268,7 +268,7 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device);
  * Resource interfaces
  */
 typedef
-acpi_status(*ACPI_WALK_RESOURCE_CALLBACK) (struct acpi_resource * resource,
+acpi_status(*acpi_walk_resource_callback) (struct acpi_resource * resource,
                                           void *context);
 
 acpi_status
@@ -290,7 +290,7 @@ acpi_get_possible_resources(acpi_handle device_handle,
 acpi_status
 acpi_walk_resources(acpi_handle device_handle,
                    char *name,
-                   ACPI_WALK_RESOURCE_CALLBACK user_function, void *context);
+                   acpi_walk_resource_callback user_function, void *context);
 
 acpi_status
 acpi_set_current_resources(acpi_handle device_handle,