diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 08:22:37 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 08:22:37 -0400 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /sound/soc/omap | |
| parent | 9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (diff) | |
| parent | 34e51ce60a210094bd66cf0a75dd8512247618ca (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 8e1431cb46bb..1bdbb0427183 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
| @@ -327,7 +327,7 @@ int omap_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | |||
| 327 | if (!card->dev->dma_mask) | 327 | if (!card->dev->dma_mask) |
| 328 | card->dev->dma_mask = &omap_pcm_dmamask; | 328 | card->dev->dma_mask = &omap_pcm_dmamask; |
| 329 | if (!card->dev->coherent_dma_mask) | 329 | if (!card->dev->coherent_dma_mask) |
| 330 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | 330 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
| 331 | 331 | ||
| 332 | if (dai->playback.channels_min) { | 332 | if (dai->playback.channels_min) { |
| 333 | ret = omap_pcm_preallocate_dma_buffer(pcm, | 333 | ret = omap_pcm_preallocate_dma_buffer(pcm, |