From: Andrew Morton <akpm@osdl.org>

Renaming that thing may not have been such a great idea.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/pnp/pnpacpi/rsparser.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/pnp/pnpacpi/rsparser.c~pnpacpi-handle-address-descriptors-in-_prs-fix-for-git-acpi-change drivers/pnp/pnpacpi/rsparser.c
--- devel/drivers/pnp/pnpacpi/rsparser.c~pnpacpi-handle-address-descriptors-in-_prs-fix-for-git-acpi-change	2005-09-23 15:07:45.000000000 -0700
+++ devel-akpm/drivers/pnp/pnpacpi/rsparser.c	2005-09-23 15:07:45.000000000 -0700
@@ -463,7 +463,8 @@ pnpacpi_parse_address_option(struct pnp_
 
 	status = acpi_resource_to_address64(r, p);
 	if (!ACPI_SUCCESS(status)) {
-		pnp_warn("PnPACPI: failed to convert resource type %d", r->id);
+		pnp_warn("PnPACPI: failed to convert resource type %d",
+				r->type);
 		return;
 	}
 
_