[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2005-08-05 00:31:42 -04:00
12 changed files with 81 additions and 37 deletions

View File

@@ -81,7 +81,7 @@ pnpacpi_parse_allocated_irqresource(struct pnp_resource_table * res, int irq)
i++;
if (i < PNP_MAX_IRQ) {
res->irq_resource[i].flags = IORESOURCE_IRQ; //Also clears _UNSET flag
if (irq == -1) {
if (irq < 0) {
res->irq_resource[i].flags |= IORESOURCE_DISABLED;
return;
}