Commit 9130adda authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

drivers/pcmcia: use nr_irqs

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a06148c3
...@@ -273,7 +273,7 @@ static int __init at91_cf_probe(struct platform_device *pdev) ...@@ -273,7 +273,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
goto fail0d; goto fail0d;
cf->socket.pci_irq = board->irq_pin; cf->socket.pci_irq = board->irq_pin;
} else } else
cf->socket.pci_irq = NR_IRQS + 1; cf->socket.pci_irq = nr_irqs + 1;
/* pcmcia layer only remaps "real" memory not iospace */ /* pcmcia layer only remaps "real" memory not iospace */
cf->socket.io_offset = (unsigned long) cf->socket.io_offset = (unsigned long)
......
...@@ -639,7 +639,7 @@ static int __devinit vrc4171_card_setup(char *options) ...@@ -639,7 +639,7 @@ static int __devinit vrc4171_card_setup(char *options)
int irq; int irq;
options += 4; options += 4;
irq = simple_strtoul(options, &options, 0); irq = simple_strtoul(options, &options, 0);
if (irq >= 0 && irq < NR_IRQS) if (irq >= 0 && irq < nr_irqs)
vrc4171_irq = irq; vrc4171_irq = irq;
if (*options != ',') if (*options != ',')
......
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