diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-19 20:49:52 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:52:06 +0200 |
| commit | 9130addad2fb2bbe1847f13c838438ff10a66d3a (patch) | |
| tree | f6e393b6806191d6f168fc41b0bd43318f459c68 /drivers | |
| parent | a06148c36d3163aee4d5d2cad4e87032d74eaa6d (diff) | |
| download | linux-9130addad2fb2bbe1847f13c838438ff10a66d3a.tar.gz linux-9130addad2fb2bbe1847f13c838438ff10a66d3a.tar.bz2 linux-9130addad2fb2bbe1847f13c838438ff10a66d3a.zip | |
drivers/pcmcia: use nr_irqs
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/at91_cf.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/vrc4171_card.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index a0ffb8ebfe00..9e1140f085fd 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c @@ -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) diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c index eee2f1cb213c..b2c412419059 100644 --- a/drivers/pcmcia/vrc4171_card.c +++ b/drivers/pcmcia/vrc4171_card.c @@ -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 != ',') |