diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
| commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
| tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/soc/s3c24xx/s3c24xx-pcm.c | |
| parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
| parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) | |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/soc/s3c24xx/s3c24xx-pcm.c')
| -rw-r--r-- | sound/soc/s3c24xx/s3c24xx-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index a9d68fa2b34a..169ddad31575 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c | |||
| @@ -419,7 +419,7 @@ static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) | |||
| 419 | } | 419 | } |
| 420 | } | 420 | } |
| 421 | 421 | ||
| 422 | static u64 s3c24xx_pcm_dmamask = DMA_32BIT_MASK; | 422 | static u64 s3c24xx_pcm_dmamask = DMA_BIT_MASK(32); |
| 423 | 423 | ||
| 424 | static int s3c24xx_pcm_new(struct snd_card *card, | 424 | static int s3c24xx_pcm_new(struct snd_card *card, |
| 425 | struct snd_soc_dai *dai, struct snd_pcm *pcm) | 425 | struct snd_soc_dai *dai, struct snd_pcm *pcm) |