PNP: introduce pnp_irq_mask_t typedef

[pandora-kernel.git] / drivers / pnp / resource.c

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 786fd35..55a57cd 100644 (file)
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -98,13 +98,13 @@ int pnp_register_irq_resource(struct pnp_dev *dev, struct pnp_option *option,
                int i;
 
                for (i = 0; i < 16; i++)
-                       if (test_bit(i, data->map))
+                       if (test_bit(i, data->map.bits))
                                pcibios_penalize_isa_irq(i, 0);
        }
 #endif
 
 #ifdef DEBUG
-       bitmap_scnprintf(buf, sizeof(buf), data->map, PNP_IRQ_NR);
+       bitmap_scnprintf(buf, sizeof(buf), data->map.bits, PNP_IRQ_NR);
        dev_dbg(&dev->dev, "  irq bitmask %s flags %#x\n", buf,
                data->flags);
 #endif
@@ -653,7 +653,7 @@ static int pnp_possible_option(struct pnp_option *option, int type,
                case IORESOURCE_IRQ:
                        for (irq = tmp->irq; irq; irq = irq->next) {
                                if (start < PNP_IRQ_NR &&
-                                   test_bit(start, irq->map))
+                                   test_bit(start, irq->map.bits))
                                        return 1;
                        }
                        break;