diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-21 11:54:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-21 11:54:34 +1100 |
| commit | 781aec55c1b640d930234898135d3ae397de4696 (patch) | |
| tree | eca6e6c569fc9520af142b993411885d642eda25 /drivers/isdn/mISDN/dsp_core.c | |
| parent | 9248af3951e80313806989efa70a49b86002d94e (diff) | |
| parent | 8b91842156ea21ca66be52fc97db44b8f16951bf (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/isdn/mISDN/dsp_core.c')
| -rw-r--r-- | drivers/isdn/mISDN/dsp_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 0222b1a35a2d..9b85295aa657 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c @@ -115,7 +115,7 @@ * * The CMX has special functions for conferences with one, two and more * members. It will allow different types of data flow. Receive and transmit - * data to/form upper layer may be swithed on/off individually without losing + * data to/form upper layer may be switched on/off individually without losing * features of CMX, Tones and DTMF. * * Echo Cancellation: Sometimes we like to cancel echo from the interface. |