diff options
| author | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-20 19:20:18 +0000 |
|---|---|---|
| committer | mattf <mattf@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-07-20 19:20:18 +0000 |
| commit | d933a168eca6b43eac7ba30ffa251ac74b4a8c38 (patch) | |
| tree | 63ff50663a5cedab2ffd142b3a08fe4821dbed36 | |
| parent | 0f1131125761eef52a7419d27d1aa49ddae89b70 (diff) | |
Merged revisions 2766 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r2766 | mattf | 2007-07-20 14:19:12 -0500 (Fri, 20 Jul 2007) | 9 lines
Merged revisions 2765 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2765 | mattf | 2007-07-20 14:17:25 -0500 (Fri, 20 Jul 2007) | 1 line
Add new 2.6.22 api updates
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2767 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | wctdm24xxp/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wctdm24xxp/base.c b/wctdm24xxp/base.c index a1abe1d..517909c 100644 --- a/wctdm24xxp/base.c +++ b/wctdm24xxp/base.c @@ -3978,7 +3978,7 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic /* Keep track of which device we are */ pci_set_drvdata(pdev, wc); - if (request_irq(pdev->irq, wctdm_interrupt, SA_SHIRQ, wc->variety, wc)) { + if (request_irq(pdev->irq, wctdm_interrupt, ZAP_IRQ_SHARED, wc->variety, wc)) { printk("wctdm24xxp: Unable to request IRQ %d\n", pdev->irq); if (wc->freeregion) release_region(wc->iobase, 0xff); @@ -4130,7 +4130,7 @@ static int __init wctdm_init(void) memset((void *)ifaces,0,(sizeof(struct wctdm *))*WC_MAX_IFACES); - res = pci_module_init(&wctdm_driver); + res = zap_pci_module(&wctdm_driver); if (res) return -ENODEV; return 0; |