From: Andrew Morton Cc: "Brown, Len" Signed-off-by: Andrew Morton --- drivers/pci/hotplug/shpchprm_acpi.c | 5 +++-- drivers/serial/8250_acpi.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff -puN drivers/pci/hotplug/shpchprm_acpi.c~git-acpi-build-fix-2 drivers/pci/hotplug/shpchprm_acpi.c --- devel/drivers/pci/hotplug/shpchprm_acpi.c~git-acpi-build-fix-2 2005-09-22 23:56:43.000000000 -0700 +++ devel-akpm/drivers/pci/hotplug/shpchprm_acpi.c 2005-09-22 23:56:43.000000000 -0700 @@ -649,7 +649,7 @@ static acpi_status acpi_parse_crs( while (!done) { dbg("acpi_shpchprm: PCI bus 0x%x Resource structure %x.\n", ab->bus, count++); - switch (resource->id) { + switch (resource->type) { case ACPI_RSTYPE_IRQ: dbg("Irq -------- Resource\n"); break; @@ -697,7 +697,8 @@ static acpi_status acpi_parse_crs( dbg("Ext Irq -------- Resource\n"); break; default: - dbg("Invalid -------- resource type 0x%x\n", resource->id); + dbg("Invalid -------- resource type 0x%x\n", + resource->type); break; } diff -puN drivers/serial/8250_acpi.c~git-acpi-build-fix-2 drivers/serial/8250_acpi.c --- devel/drivers/serial/8250_acpi.c~git-acpi-build-fix-2 2005-09-22 23:56:43.000000000 -0700 +++ devel-akpm/drivers/serial/8250_acpi.c 2005-09-22 23:56:43.000000000 -0700 @@ -83,11 +83,11 @@ static acpi_status acpi_serial_resource( status = acpi_resource_to_address64(res, &addr); if (ACPI_SUCCESS(status)) return acpi_serial_mmio(port, &addr); - else if (res->id == ACPI_RSTYPE_IO) + else if (res->type == ACPI_RSTYPE_IO) return acpi_serial_port(port, &res->data.io); - else if (res->id == ACPI_RSTYPE_EXT_IRQ) + else if (res->type == ACPI_RSTYPE_EXT_IRQ) return acpi_serial_ext_irq(port, &res->data.extended_irq); - else if (res->id == ACPI_RSTYPE_IRQ) + else if (res->type == ACPI_RSTYPE_IRQ) return acpi_serial_irq(port, &res->data.irq); return AE_OK; } _