diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 11:01:27 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 11:01:27 -0400 |
| commit | 907bc6c7fc7071b00083fc11e510e47dd93df45d (patch) | |
| tree | 0697a608561522c00da9e1814974a2eb051bb96d /sound/soc/s3c24xx/s3c24xx_uda134x.c | |
| parent | d2b247a8be57647d1745535acd58169fbcbe431a (diff) | |
| parent | 2a0f5cb32772e9a9560209e241a80bfbbc31dbc3 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/soc/s3c24xx/s3c24xx_uda134x.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c index 8e79a416db57..c215d32d6322 100644 --- a/sound/soc/s3c24xx/s3c24xx_uda134x.c +++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c | |||
| @@ -67,7 +67,7 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) | |||
| 67 | { | 67 | { |
| 68 | int ret = 0; | 68 | int ret = 0; |
| 69 | #ifdef ENFORCE_RATES | 69 | #ifdef ENFORCE_RATES |
| 70 | struct snd_pcm_runtime *runtime = substream->runtime;; | 70 | struct snd_pcm_runtime *runtime = substream->runtime; |
| 71 | #endif | 71 | #endif |
| 72 | 72 | ||
| 73 | mutex_lock(&clk_lock); | 73 | mutex_lock(&clk_lock); |