[svn-commits] tzafrir: branch linux/2.3 r8545 - in /linux/branches/2.3: ./ drivers/dahdi/ d...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Apr 19 14:42:55 CDT 2010
Author: tzafrir
Date: Mon Apr 19 14:42:53 2010
New Revision: 8545
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8545
Log:
typos, mostly unkown
Merged revisions 8539 via svnmerge from
http://svn.digium.com/svn/dahdi/linux/trunk
Modified:
linux/branches/2.3/ (props changed)
linux/branches/2.3/drivers/dahdi/dahdi-base.c
linux/branches/2.3/drivers/dahdi/wcb4xxp/Makefile (props changed)
linux/branches/2.3/drivers/dahdi/xpp/card_bri.c
linux/branches/2.3/drivers/dahdi/xpp/card_global.c
linux/branches/2.3/drivers/dahdi/xpp/card_pri.c
linux/branches/2.3/drivers/dahdi/xpp/xpp_debug
Propchange: linux/branches/2.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 14:42:53 2010
@@ -1,1 +1,1 @@
-/linux/trunk:8538
+/linux/trunk:8538-8539
Propchange: linux/branches/2.3/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 19 14:42:53 2010
@@ -1,1 +1,1 @@
-/linux/trunk:1-8505,8538
+/linux/trunk:1-8505,8538-8539
Modified: linux/branches/2.3/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.3/drivers/dahdi/dahdi-base.c?view=diff&rev=8545&r1=8544&r2=8545
==============================================================================
--- linux/branches/2.3/drivers/dahdi/dahdi-base.c (original)
+++ linux/branches/2.3/drivers/dahdi/dahdi-base.c Mon Apr 19 14:42:53 2010
@@ -4119,7 +4119,7 @@
* Set the rxhooksig back to
* DAHDI_RXSIG_INITIAL so that new events are
* queued on the channel with the actual
- * recieved hook state.
+ * received hook state.
*
*/
spans[j]->chans[x]->rxhooksig = DAHDI_RXSIG_INITIAL;
@@ -6944,7 +6944,7 @@
* @chan: the DAHDI channel
* @cursig: the bits to set
*
- * Set the channel's rxsig (recieved: from device to userspace) and act
+ * Set the channel's rxsig (received: from device to userspace) and act
* accordingly.
*/
void dahdi_rbsbits(struct dahdi_chan *chan, int cursig)
@@ -7125,7 +7125,7 @@
* @rxchunk: chunk of audio on which to cancel echo
* @txchunk: reference chunk from the other direction
*
- * The echo canceller function fixes recieved (from device to userspace)
+ * The echo canceller function fixes received (from device to userspace)
* audio. In order to fix it it uses the transmitted audio as a
* reference. This call updates the echo canceller for a single chunk (8
* bytes).
Propchange: linux/branches/2.3/drivers/dahdi/wcb4xxp/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 19 14:42:53 2010
@@ -1,0 +1,1 @@
+/linux/trunk/drivers/dahdi/wcb4xxp/Makefile:8539
Modified: linux/branches/2.3/drivers/dahdi/xpp/card_bri.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.3/drivers/dahdi/xpp/card_bri.c?view=diff&rev=8545&r1=8544&r2=8545
==============================================================================
--- linux/branches/2.3/drivers/dahdi/xpp/card_bri.c (original)
+++ linux/branches/2.3/drivers/dahdi/xpp/card_bri.c Mon Apr 19 14:42:53 2010
@@ -1719,7 +1719,7 @@
priv->state_register.bits.v_su_info0,
priv->state_register.bits.v_g2_g3);
} else
- len += sprintf(page + len, "Unkown\n");
+ len += sprintf(page + len, "Unknown\n");
if(IS_NT(xpd)) {
len += sprintf(page + len, "T1 Timer: %d\n", priv->t1);
} else {
Modified: linux/branches/2.3/drivers/dahdi/xpp/card_global.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.3/drivers/dahdi/xpp/card_global.c?view=diff&rev=8545&r1=8544&r2=8545
==============================================================================
--- linux/branches/2.3/drivers/dahdi/xpp/card_global.c (original)
+++ linux/branches/2.3/drivers/dahdi/xpp/card_global.c Mon Apr 19 14:42:53 2010
@@ -158,7 +158,7 @@
//XPD_DBG(REGS, xpd, "READING\n");
break;
default:
- XPD_ERR(xpd, "Unkown operation type '%c'\n", op);
+ XPD_ERR(xpd, "Unknown operation type '%c'\n", op);
goto out;
}
addr_mode = argv[argno][1];
@@ -187,7 +187,7 @@
//XPD_DBG(REGS, xpd, "Multibyte (%c)\n", addr_mode);
break;
default:
- XPD_ERR(xpd, "Unkown addressing type '%c'\n", addr_mode);
+ XPD_ERR(xpd, "Unknown addressing type '%c'\n", addr_mode);
goto out;
}
if(argv[argno][2] != '\0') {
Modified: linux/branches/2.3/drivers/dahdi/xpp/card_pri.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.3/drivers/dahdi/xpp/card_pri.c?view=diff&rev=8545&r1=8544&r2=8545
==============================================================================
--- linux/branches/2.3/drivers/dahdi/xpp/card_pri.c (original)
+++ linux/branches/2.3/drivers/dahdi/xpp/card_pri.c Mon Apr 19 14:42:53 2010
@@ -101,7 +101,7 @@
static const char *pri_protocol_name(enum pri_protocol pri_protocol)
{
static const char *protocol_names[] = {
- [PRI_PROTO_0] = "??", /* unkown */
+ [PRI_PROTO_0] = "??", /* unknown */
[PRI_PROTO_E1] = "E1",
[PRI_PROTO_T1] = "T1",
[PRI_PROTO_J1] = "J1"
@@ -1766,7 +1766,7 @@
spin_unlock_irqrestore(&xpd->lock, flags);
}
-/*! Copy PCM chunks from the packet we recieved to the xpd struct.
+/*! Copy PCM chunks from the packet we received to the xpd struct.
* \param xbus xbus of target xpd.
* \param xpd target xpd.
* \param pack Source packet.
Modified: linux/branches/2.3/drivers/dahdi/xpp/xpp_debug
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.3/drivers/dahdi/xpp/xpp_debug?view=diff&rev=8545&r1=8544&r2=8545
==============================================================================
--- linux/branches/2.3/drivers/dahdi/xpp/xpp_debug (original)
+++ linux/branches/2.3/drivers/dahdi/xpp/xpp_debug Mon Apr 19 14:42:53 2010
@@ -82,7 +82,7 @@
let j++
done
if [ "$found" -eq 0 ]; then
- echo >&2 "$0: Unkown debug flag '$wanted'"
+ echo >&2 "$0: Unknown debug flag '$wanted'"
exit 1
fi
done
@@ -98,7 +98,7 @@
shift
if ! echo "$modules" | grep -w "$module" > /dev/null; then
- echo >&2 "$0: Unkown module $module"
+ echo >&2 "$0: Unknown module $module"
exit 1
fi
More information about the svn-commits
mailing list