Merge branch 'for-2.6.36' into for-2.6.37

[mv-sheeva.git] / sound / soc / soc-core.c

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index cea0fe488623b52328fdae67c50a5743eac72910..3d480eb3555febf066548f40ad2cc65be3ee308e 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1531,7 +1531,7 @@ card_probe_error:
 }
 
 /*
- * Attempt to initialise any uninitalised cards.  Must be called with
+ * Attempt to initialise any uninitialised cards.  Must be called with
  * client_mutex.
  */
 static void snd_soc_instantiate_cards(void)