Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / drivers / isdn / mISDN / dsp_core.c

diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
index c12cd2f..77ee286 100644 (file)
--- a/drivers/isdn/mISDN/dsp_core.c
+++ b/drivers/isdn/mISDN/dsp_core.c
@@ -506,7 +506,7 @@ tone_off:
                        break;
                }
                dsp->cmx_delay = (*((int *)data)) << 3;
-                       /* miliseconds to samples */
+                       /* milliseconds to samples */
                if (dsp->cmx_delay >= (CMX_BUFF_HALF>>1))
                        /* clip to half of maximum usable buffer
                        (half of half buffer) */