Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[mv-sheeva.git] / sound / oss / sb_ess.c

diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index 9890cf2066ffef53e0773961cd0837d42ee4b740..5c773dff5ac5dd702d2f463c348373e999f0ef65 100644 (file)
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -168,7 +168,7 @@
  * corresponding playback levels, unless recmask says they aren't recorded. In
  * the latter case the recording volumes are 0.
  * Now recording levels of inputs can be controlled, by changing the playback
- * levels. Futhermore several devices can be recorded together (which is not
+ * levels. Furthermore several devices can be recorded together (which is not
  * possible with the ES1688).
  * Besides the separate recording level control for each input, the common
  * recording level can also be controlled by RECLEV as described above.