[svn-commits] kpfleming: branch 1.4 r2755 - in /branches/1.4: ./ wctc4xxp/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Wed Jul 18 20:22:54 2007
New Revision: 2755

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2755
Log:
Merged revisions 2754 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2754 | kpfleming | 2007-07-18 20:21:25 -0500 (Wed, 18 Jul 2007) | 2 lines

convert a few drivers over to current PCI module registration function

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/wctc4xxp/base.c
    branches/1.4/wctdm24xxp.c
    branches/1.4/wcte12xp.c

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

Modified: branches/1.4/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctc4xxp/base.c?view=diff&rev=2755&r1=2754&r2=2755
==============================================================================
--- branches/1.4/wctc4xxp/base.c (original)
+++ branches/1.4/wctc4xxp/base.c Wed Jul 18 20:22:54 2007
@@ -1844,7 +1844,7 @@
 {
 	int res;
 
-	res = pci_module_init(&wcdte_driver);
+	res = zap_pci_module(&wcdte_driver);
 	if (res)
 		return -ENODEV;
 	return 0;

Modified: branches/1.4/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp.c?view=diff&rev=2755&r1=2754&r2=2755
==============================================================================
--- branches/1.4/wctdm24xxp.c (original)
+++ branches/1.4/wctdm24xxp.c Wed Jul 18 20:22:54 2007
@@ -3519,7 +3519,7 @@
 		return -ENODEV;
 	}
 
-	res = pci_module_init(&wctdm_driver);
+	res = zap_pci_module(&wctdm_driver);
 	if (res)
 		return -ENODEV;
 	return 0;

Modified: branches/1.4/wcte12xp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp.c?view=diff&rev=2755&r1=2754&r2=2755
==============================================================================
--- branches/1.4/wcte12xp.c (original)
+++ branches/1.4/wcte12xp.c Wed Jul 18 20:22:54 2007
@@ -2012,7 +2012,7 @@
 {
 	int res;
 
-	res = pci_module_init(&te12xp_driver);
+	res = zap_pci_module(&te12xp_driver);
 
 	return res ? -ENODEV : 0;
 }