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

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 75575f6c349c..1e296cbef004 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -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;
                 }