[zaptel-commits] mattf: trunk r2768 - /trunk/wctdm24xxp/base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Jul 20 14:23:20 2007
New Revision: 2768

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2768
Log:
Revert that last commit.  Trunk hasn't got the API updates for 2.6.22

Modified:
    trunk/wctdm24xxp/base.c

Modified: trunk/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp/base.c?view=diff&rev=2768&r1=2767&r2=2768
==============================================================================
--- trunk/wctdm24xxp/base.c (original)
+++ trunk/wctdm24xxp/base.c Fri Jul 20 14:23:20 2007
@@ -3978,7 +3978,7 @@
 			/* Keep track of which device we are */
 			pci_set_drvdata(pdev, wc);
 
-			if (request_irq(pdev->irq, wctdm_interrupt, ZAP_IRQ_SHARED, wc->variety, wc)) {
+			if (request_irq(pdev->irq, wctdm_interrupt, SA_SHIRQ, 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 = zap_pci_module(&wctdm_driver);
+	res = pci_module_init(&wctdm_driver);
 	if (res)
 		return -ENODEV;
 	return 0;