From fb1a659ea01a8ed27b8d0e6e3c439e826f843e36 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Thu, 19 Jul 2007 02:07:54 +0000 Subject: Merged revisions 2756 via svnmerge from https://origsvn.digium.com/svn/zaptel/branches/1.2 ........ r2756 | kpfleming | 2007-07-18 21:05:03 -0500 (Wed, 18 Jul 2007) | 2 lines update to 2.6.22 request_irq() flags ........ git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2757 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- wct4xxp/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'wct4xxp') diff --git a/wct4xxp/base.c b/wct4xxp/base.c index ff32d57..4aebb70 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -3691,14 +3691,14 @@ static int __devinit t4_init_one(struct pci_dev *pdev, const struct pci_device_i #ifdef SUPPORT_GEN1 - if (request_irq(pdev->irq, (dt->flags & FLAG_2NDGEN) ? t4_interrupt_gen2 :t4_interrupt, SA_INTERRUPT | SA_SHIRQ, (wc->numspans == 2) ? "wct2xxp" : "wct4xxp", wc)) + if (request_irq(pdev->irq, (dt->flags & FLAG_2NDGEN) ? t4_interrupt_gen2 :t4_interrupt, ZAP_IRQ_SHARED_DISABLED, (wc->numspans == 2) ? "wct2xxp" : "wct4xxp", wc)) #else if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) { printk("This driver does not support 1st gen modules\n"); kfree(wc); return -ENODEV; } - if (request_irq(pdev->irq, t4_interrupt_gen2, SA_INTERRUPT | SA_SHIRQ, "t4xxp", wc)) + if (request_irq(pdev->irq, t4_interrupt_gen2, ZAP_IRQ_SHARED_DISABLED, "t4xxp", wc)) #endif { printk("t4xxp: Unable to request IRQ %d\n", pdev->irq); -- cgit v1.2.3