diff options
author | Andi Kleen <ak@linux.intel.com> | 2008-08-25 06:05:02 -0400 |
---|---|---|
committer | Andi Kleen <ak@linux.intel.com> | 2008-08-25 06:05:02 -0400 |
commit | 321a0580d17e58254e48820fe15a583a6409529c (patch) | |
tree | d15bea8267e522f386bc882cfabd2c118b8c411a | |
parent | f54538c3a01004a783b13f294ca39cffdc0bc0e1 (diff) | |
parent | de82ff783bcb2b52353a7c99b4a8524ae739da73 (diff) |
Merge branch 'pnp-fix' into release-2.6.27
-rw-r--r-- | drivers/pnp/pnpacpi/rsparser.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index d7e9f2152df0..95015cbfd33f 100644 --- 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, | |||
405 | 405 | ||
406 | case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: | 406 | case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: |
407 | extended_irq = &res->data.extended_irq; | 407 | extended_irq = &res->data.extended_irq; |
408 | if (extended_irq->producer_consumer == ACPI_PRODUCER) | ||
409 | return AE_OK; | ||
410 | 408 | ||
411 | if (extended_irq->interrupt_count == 0) | 409 | if (extended_irq->interrupt_count == 0) |
412 | pnp_add_irq_resource(dev, 0, IORESOURCE_DISABLED); | 410 | pnp_add_irq_resource(dev, 0, IORESOURCE_DISABLED); |