Author: mattf Date: Fri Jul 20 14:20:18 2007 New Revision: 2767 URL: http://svn.digium.com/view/zaptel?view=rev&rev=2767 Log: 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 ........ ................ Modified: trunk/wctdm24xxp/base.c Modified: trunk/wctdm24xxp/base.c URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp/base.c?view=diff&rev=2767&r1=2766&r2=2767 ============================================================================== --- trunk/wctdm24xxp/base.c (original) +++ trunk/wctdm24xxp/base.c Fri Jul 20 14:20:18 2007 @@ -3978,7 +3978,7 @@ /* 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 @@ 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; _______________________________________________ --Bandwidth and Colocation Provided by http://www.api-digital.com-- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
