mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 06:12:08 +00:00
drivers/pcmcia: use nr_irqs
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
a06148c36d
commit
9130addad2
@ -273,7 +273,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
|
||||
goto fail0d;
|
||||
cf->socket.pci_irq = board->irq_pin;
|
||||
} else
|
||||
cf->socket.pci_irq = NR_IRQS + 1;
|
||||
cf->socket.pci_irq = nr_irqs + 1;
|
||||
|
||||
/* pcmcia layer only remaps "real" memory not iospace */
|
||||
cf->socket.io_offset = (unsigned long)
|
||||
|
@ -639,7 +639,7 @@ static int __devinit vrc4171_card_setup(char *options)
|
||||
int irq;
|
||||
options += 4;
|
||||
irq = simple_strtoul(options, &options, 0);
|
||||
if (irq >= 0 && irq < NR_IRQS)
|
||||
if (irq >= 0 && irq < nr_irqs)
|
||||
vrc4171_irq = irq;
|
||||
|
||||
if (*options != ',')
|
||||
|
Loading…
Reference in New Issue
Block a user