[zaptel-commits] trunk r1102 - in /trunk: ./ wctdm24xxp.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed May 31 14:43:46 2006
New Revision: 1102

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

........
r1101 | kpfleming | 2006-05-31 14:42:45 -0500 (Wed, 31 May 2006) | 2 lines

minor typo in error message

........

Modified:
    trunk/   (props changed)
    trunk/wctdm24xxp.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Wed May 31 14:43:46 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
+/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

Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?rev=1102&r1=1101&r2=1102&view=diff
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Wed May 31 14:43:46 2006
@@ -1589,7 +1589,7 @@
 	}
 
 	if (vbat < 0xc0) {
-		printk("ProSLIC on module %d failed to powerup within %d ms (%d mV only)\n\n -- DID YOU REMEMBER TO PLUG IN THE HD POWER CABLE TO THE TDM400P??\n",
+		printk("ProSLIC on module %d failed to powerup within %d ms (%d mV only)\n\n -- DID YOU REMEMBER TO PLUG IN THE HD POWER CABLE TO THE TDM2400P??\n",
 		       card, (int)(((jiffies - origjiffies) * 1000 / HZ)),
 			vbat * 375);
 		return -1;