Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[sfrench/cifs-2.6.git] / sound / soc / s6000 / s6000-pcm.c

diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index 0eb1722f6581d831f0121e7299a22fbee4813226..1d61109e09fa272e3b7e6855e8f2ba303f2e8a95 100644 (file)
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
@@ -196,7 +196,7 @@ static int s6000_pcm_start(struct snd_pcm_substream *substream)
                           0 /* destination skip after chunk (impossible) */,
                           4 /* 16 byte burst size */,
                           -1 /* don't conserve bandwidth */,
-                          0 /* low watermark irq descriptor theshold */,
+                          0 /* low watermark irq descriptor threshold */,
                           0 /* disable hardware timestamps */,
                           1 /* enable channel */);