Merge branch 'for-2.6.38' into for-2.6.39

[karo-tx-linux.git] / sound / soc / samsung / smdk_spdif.c

diff --git a/sound/soc/samsung/smdk_spdif.c b/sound/soc/samsung/smdk_spdif.c
index d42fe8df7144086d3d1497908d29e5afae36169d..e8ac961c6ba10140fa62768d8f6c3c29c0c15128 100644 (file)
--- a/sound/soc/samsung/smdk_spdif.c
+++ b/sound/soc/samsung/smdk_spdif.c
@@ -56,7 +56,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev)
                goto out3;
        }
 
-       /* Set audio clock heirachy for S/PDIF */
+       /* Set audio clock hierarchy for S/PDIF */
        clk_set_parent(mout_epll, fout_epll);
        clk_set_parent(sclk_audio0, mout_epll);
        clk_set_parent(sclk_spdif, sclk_audio0);
@@ -74,7 +74,7 @@ out1:
 
 /* We should haved to set clock directly on this part because of clock
  * scheme of Samsudng SoCs did not support to set rates from abstrct
- * clock of it's heirachy.
+ * clock of it's hierarchy.
  */
 static int set_audio_clock_rate(unsigned long epll_rate,
                                unsigned long audio_rate)
@@ -190,7 +190,7 @@ static int __init smdk_init(void)
        if (ret)
                goto err3;
 
-       /* Set audio clock heirachy manually */
+       /* Set audio clock hierarchy manually */
        ret = set_audio_clock_heirachy(smdk_snd_spdif_device);
        if (ret)
                goto err4;