diff options
| author | chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil> | 2010-07-09 23:42:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-12 23:21:48 -0400 |
| commit | 06df277a670263a073362046855851aad278d988 (patch) | |
| tree | 9945871b332fb854c59a46c7e8dca29d69683de2 /drivers/atm/nicstar.c | |
| parent | 97b72e4320a9aaa4a7f1592ee7d2da7e2c9bd349 (diff) | |
atm: remove IRQF_DISABLED in combination with IRQF_SHARED
Signed-off-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/atm/nicstar.c')
| -rw-r--r-- | drivers/atm/nicstar.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 59876c66a92a..cff337ef85fd 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c | |||
| @@ -765,8 +765,7 @@ static int __devinit ns_init_card(int i, struct pci_dev *pcidev) | |||
| 765 | 765 | ||
| 766 | card->intcnt = 0; | 766 | card->intcnt = 0; |
| 767 | if (request_irq | 767 | if (request_irq |
| 768 | (pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, | 768 | (pcidev->irq, &ns_irq_handler, IRQF_SHARED, "nicstar", card) != 0) { |
| 769 | "nicstar", card) != 0) { | ||
| 770 | printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq); | 769 | printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq); |
| 771 | error = 9; | 770 | error = 9; |
| 772 | ns_init_card_error(card, error); | 771 | ns_init_card_error(card, error); |