Merge branch 'pnp-fix' into release-2.6.27

321a0580 · Andi Kleen · f54538c3 · de82ff78 · 321a0580
Commit 321a0580 authored Aug 25, 2008 by Andi Kleen
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

drivers/pnp/pnpacpi/rsparser.c drivers/pnp/pnpacpi/rsparser.c +0 -2

No files found.
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -405,8 +405,6 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,

 	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
 		extended_irq = &res->data.extended_irq;
-		if (extended_irq->producer_consumer == ACPI_PRODUCER)
-			return AE_OK;

 		if (extended_irq->interrupt_count == 0)
 			pnp_add_irq_resource(dev, 0, IORESOURCE_DISABLED);