Merge branch 'for-2.6.32' into for-2.6.33

[lisovros/linux_canprio.git] / sound / soc / pxa / pxa-ssp.c

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index a2b1e8fd5d857898e4cf8602d716b28144a346a5..3bd7712f029b9024315bc3cc3f8bf5b6f6988235 100644 (file)
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -351,7 +351,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id,
                        do_div(tmp, freq_out);
                        val = tmp;
 
-                       val = (val << 16) | 64;;
+                       val = (val << 16) | 64;
                        ssp_write_reg(ssp, SSACDD, val);
 
                        ssacd |= (0x6 << 4);