lkml.org 
[lkml]   [2008]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/25] drivers/pcmcia to use nr_irqs
    Date
    Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
    ---
    drivers/pcmcia/at91_cf.c | 2 +-
    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 6849685..194c8ba 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 eee2f1c..b2c4124 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 != ',')
    --
    1.5.4.5


    \
     
     \ /
      Last update: 2008-08-03 05:07    [W:0.022 / U:0.392 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site