git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
acpi
/
acpixf.h
diff --git
a/include/acpi/acpixf.h
b/include/acpi/acpixf.h
index
66cf2ec
..
049e9aa
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
* 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
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_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,
acpi_status
acpi_set_current_resources(acpi_handle device_handle,