Merge branch 'topic/misc' into for-linus

[pandora-kernel.git] / include / sound / control.h

diff --git a/include/sound/control.h b/include/sound/control.h
index 4042381..1a94a21 100644 (file)
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -192,7 +192,7 @@ int _snd_ctl_add_slave(struct snd_kcontrol *master, struct snd_kcontrol *slave,
  * Returns zero if successful or a negative error code.
  *
  * All slaves must be the same type (returning the same information
- * via info callback).  The fucntion doesn't check it, so it's your
+ * via info callback).  The function doesn't check it, so it's your
  * responsibility.
  *
  * Also, some additional limitations: