Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-drm-fsl-dcu.git] / include / linux / ixjuser.h

diff --git a/include/linux/ixjuser.h b/include/linux/ixjuser.h
index fd1756d3a47e9b29f77f917b730464f4fb5daa33..88b45895746d654a6dc1ca3332c72c7990f60110 100644 (file)
--- a/include/linux/ixjuser.h
+++ b/include/linux/ixjuser.h
@@ -315,7 +315,7 @@ typedef struct {
 * structures.  If the freq0 variable is non-zero, the tone table contents
 * for the tone_index are updated to the frequencies and gains defined.  It
 * should be noted that DTMF tones cannot be reassigned, so if DTMF tone
-* table indexs are used in a cadence the frequency and gain variables will
+* table indexes are used in a cadence the frequency and gain variables will
 * be ignored.
 *
 * If the array elements contain frequency parameters the driver will