diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-01 17:19:05 -0500 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /sound/soc/s3c24xx/s3c-pcm.c | |
| parent | 9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11 (diff) | |
| parent | ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 (diff) | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'sound/soc/s3c24xx/s3c-pcm.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c-pcm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/s3c24xx/s3c-pcm.c b/sound/soc/s3c24xx/s3c-pcm.c index 9e61a7c2d9ac..a98f40c3cd29 100644 --- a/sound/soc/s3c24xx/s3c-pcm.c +++ b/sound/soc/s3c24xx/s3c-pcm.c | |||
| @@ -229,8 +229,7 @@ static int s3c_pcm_hw_params(struct snd_pcm_substream *substream, | |||
| 229 | 229 | ||
| 230 | spin_unlock_irqrestore(&pcm->lock, flags); | 230 | spin_unlock_irqrestore(&pcm->lock, flags); |
| 231 | 231 | ||
| 232 | dev_dbg(pcm->dev, "PCMSOURCE_CLK-%lu SCLK=%ufs \ | 232 | dev_dbg(pcm->dev, "PCMSOURCE_CLK-%lu SCLK=%ufs SCLK_DIV=%d SYNC_DIV=%d\n", |
| 233 | SCLK_DIV=%d SYNC_DIV=%d\n", | ||
| 234 | clk_get_rate(clk), pcm->sclk_per_fs, | 233 | clk_get_rate(clk), pcm->sclk_per_fs, |
| 235 | sclk_div, sync_div); | 234 | sclk_div, sync_div); |
| 236 | 235 | ||