[zaptel-commits] mattf: branch 1.2 r2765 - /branches/1.2/wctdm24xxp/base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Jul 20 14:17:25 2007
New Revision: 2765

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2765
Log:
Add new 2.6.22 api updates

Modified:
    branches/1.2/wctdm24xxp/base.c

Modified: branches/1.2/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctdm24xxp/base.c?view=diff&rev=2765&r1=2764&r2=2765
==============================================================================
--- branches/1.2/wctdm24xxp/base.c (original)
+++ branches/1.2/wctdm24xxp/base.c Fri Jul 20 14:17:25 2007
@@ -3374,7 +3374,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);
@@ -3525,7 +3525,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;