[zaptel-commits] mattf: branch 1.4 r2766 - in /branches/1.4: ./ wctdm24xxp/base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Jul 20 14:19:12 2007
New Revision: 2766

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2766
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/wctdm24xxp/base.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp/base.c?view=diff&rev=2766&r1=2765&r2=2766
==============================================================================
--- branches/1.4/wctdm24xxp/base.c (original)
+++ branches/1.4/wctdm24xxp/base.c Fri Jul 20 14:19:12 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;