diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 17:01:27 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 17:01:27 +0200 |
| commit | 907bc6c7fc7071b00083fc11e510e47dd93df45d (patch) | |
| tree | 0697a608561522c00da9e1814974a2eb051bb96d /sound/soc/pxa/pxa-ssp.c | |
| parent | ASoC: Add virtual enumeration support for DAPM muxes (diff) | |
| parent | Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-907bc6c7fc7071b00083fc11e510e47dd93df45d.tar.xz linux-907bc6c7fc7071b00083fc11e510e47dd93df45d.zip | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/pxa/pxa-ssp.c')
| -rw-r--r-- | sound/soc/pxa/pxa-ssp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index a2b1e8fd5d85..3bd7712f029b 100644 --- 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); |