[svn-commits] trunk r1238 - in /trunk: ./ wct4xxp_base.c xpp/card_fxo.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sat Jul 15 19:18:03 2006
New Revision: 1238

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

........
r1235 | kpfleming | 2006-07-15 19:12:55 -0500 (Sat, 15 Jul 2006) | 2 lines

eliminate compiler warning

........

Modified:
    trunk/   (props changed)
    trunk/wct4xxp_base.c
    trunk/xpp/card_fxo.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sat Jul 15 19:18:03 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1236
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076,1079,1081,1097,1101,1151,1185,1187,1205,1233,1235,1236

Modified: trunk/wct4xxp_base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp_base.c?rev=1238&r1=1237&r2=1238&view=diff
==============================================================================
--- trunk/wct4xxp_base.c (original)
+++ trunk/wct4xxp_base.c Sat Jul 15 19:18:03 2006
@@ -3122,7 +3122,7 @@
 		printk("VPM450M: Firmware not found to be loaded\n");
 		return;
 	}
-	printk("VPM450: Firmware of size %d found\n", firmware->size);
+	printk("VPM450: Firmware of size %zd found\n", firmware->size);
 #else
 	printk("VPM450: Using classic method of loading firmware\n");
 #endif

Modified: trunk/xpp/card_fxo.c
URL: http://svn.digium.com/view/zaptel/trunk/xpp/card_fxo.c?rev=1238&r1=1237&r2=1238&view=diff
==============================================================================
--- trunk/xpp/card_fxo.c (original)
+++ trunk/xpp/card_fxo.c Sat Jul 15 19:18:03 2006
@@ -433,7 +433,7 @@
 	int 		i,ret;
 
 	BUG_ON(!xpd);
-	DBG("cmd: 0x%x, expecting: 0x%x, pos=%d.\n", cmd, WCTDM_SET_ECHOTUNE, pos);
+	DBG("cmd: 0x%x, expecting: 0x%lx, pos=%d.\n", cmd, WCTDM_SET_ECHOTUNE, pos);
 	switch (cmd) {
 		case WCTDM_SET_ECHOTUNE:
 			DBG("-- Setting echo registers: \n");