commit eca008c8134df15262a0362623edb59902628c95
author Len Brown <len.brown@intel.com> Thu Sep 22 00:25:18 2005 -0400
committer Len Brown <len.brown@intel.com> Thu Sep 22 00:28:05 2005 -0400
tree a3c08ab2d42b5e56c7f5cbe01e598d9895ca4fca
parent bda663d36b94c723153246a4231bbc0f1cd1836e

[ACPI] handle ACPICA 20050916's acpi_resource.type rename

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/pci_link.c

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 82292b7..d8956c0 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -108,7 +108,7 @@
 
 	ACPI_FUNCTION_TRACE("acpi_pci_link_check_possible");
 
-	switch (resource->id) {
+	switch (resource->type) {
 	case ACPI_RSTYPE_START_DPF:
 		return_ACPI_STATUS(AE_OK);
 	case ACPI_RSTYPE_IRQ:
@@ -201,7 +201,7 @@
 
 	ACPI_FUNCTION_TRACE("acpi_pci_link_check_current");
 
-	switch (resource->id) {
+	switch (resource->type) {
 	case ACPI_RSTYPE_IRQ:
 		{
 			struct acpi_resource_irq *p = &resource->data.irq;
@@ -326,7 +326,7 @@
 
 	switch (link->irq.resource_type) {
 	case ACPI_RSTYPE_IRQ:
-		resource->res.id = ACPI_RSTYPE_IRQ;
+		resource->res.type = ACPI_RSTYPE_IRQ;
 		resource->res.length = sizeof(struct acpi_resource);
 		resource->res.data.irq.edge_level = link->irq.edge_level;
 		resource->res.data.irq.active_high_low =
@@ -341,7 +341,7 @@
 		break;
 
 	case ACPI_RSTYPE_EXT_IRQ:
-		resource->res.id = ACPI_RSTYPE_EXT_IRQ;
+		resource->res.type = ACPI_RSTYPE_EXT_IRQ;
 		resource->res.length = sizeof(struct acpi_resource);
 		resource->res.data.extended_irq.producer_consumer =
 		    ACPI_CONSUMER;
@@ -364,7 +364,7 @@
 		goto end;
 
 	}
-	resource->end.id = ACPI_RSTYPE_END_TAG;
+	resource->end.type = ACPI_RSTYPE_END_TAG;
 
 	/* Attempt to set the resource */
 	status = acpi_set_current_resources(link->handle, &buffer);