Skip to content

L
linux-davinci
Commit 321a0580 authored by Andi Kleen's avatar Andi Kleen
Browse files
Options

Merge branch 'pnp-fix' into release-2.6.27

parents f54538c3 de82ff78
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
drivers/pnp/pnpacpi/rsparser.c
View file @ 321a0580
...@@ -405,8 +405,6 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, ...@@ -405,8 +405,6 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
extended_irq = &res->data.extended_irq; extended_irq = &res->data.extended_irq;
if (extended_irq->producer_consumer == ACPI_PRODUCER)
return AE_OK;
if (extended_irq->interrupt_count == 0) if (extended_irq->interrupt_count == 0)
pnp_add_irq_resource(dev, 0, IORESOURCE_DISABLED); pnp_add_irq_resource(dev, 0, IORESOURCE_DISABLED);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment