Merge branch 'for-2.6.32' into for-2.6.33

This commit is contained in:
Mark Brown
2009-10-06 16:01:27 +01:00
10226 ha cambiato i file con 1035896 aggiunte e 535551 eliminazioni

Vedi File

@@ -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);