Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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)
+1 −1
Original line number Diff line number Diff line
@@ -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 != ',')