git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull release into acpica branch
[pandora-kernel.git]
/
drivers
/
acpi
/
resources
/
rsxface.c
diff --git
a/drivers/acpi/resources/rsxface.c
b/drivers/acpi/resources/rsxface.c
index
ee5a5c5
..
1a87c4c
100644
(file)
--- a/
drivers/acpi/resources/rsxface.c
+++ b/
drivers/acpi/resources/rsxface.c
@@
-269,7
+269,7
@@
acpi_walk_resources(acpi_handle device_handle,
/* Walk the resource list */
for (;;) {
/* Walk the resource list */
for (;;) {
- if (!resource || resource->
id
== ACPI_RSTYPE_END_TAG) {
+ if (!resource || resource->
type
== ACPI_RSTYPE_END_TAG) {
break;
}
break;
}
@@
-360,8
+360,8
@@
EXPORT_SYMBOL(acpi_set_current_resources);
*
* FUNCTION: acpi_resource_to_address64
*
*
* FUNCTION: acpi_resource_to_address64
*
- * PARAMETERS:
r
esource - Pointer to a resource
- *
o
ut - Pointer to the users's return
+ * PARAMETERS:
R
esource - Pointer to a resource
+ *
O
ut - Pointer to the users's return
* buffer (a struct
* struct acpi_resource_address64)
*
* buffer (a struct
* struct acpi_resource_address64)
*
@@
-381,7
+381,7
@@
acpi_resource_to_address64(struct acpi_resource *resource,
struct acpi_resource_address16 *address16;
struct acpi_resource_address32 *address32;
struct acpi_resource_address16 *address16;
struct acpi_resource_address32 *address32;
- switch (resource->
id
) {
+ switch (resource->
type
) {
case ACPI_RSTYPE_ADDRESS16:
address16 = (struct acpi_resource_address16 *)&resource->data;
case ACPI_RSTYPE_ADDRESS16:
address16 = (struct acpi_resource_address16 *)&resource->data;