git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
sound
/
soc
/
omap
/
omap-pcm.c
diff --git
a/sound/soc/omap/omap-pcm.c
b/sound/soc/omap/omap-pcm.c
index
b078ed5
..
07cf7f4
100644
(file)
--- a/
sound/soc/omap/omap-pcm.c
+++ b/
sound/soc/omap/omap-pcm.c
@@
-328,7
+328,7
@@
int omap_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
if (!card->dev->dma_mask)
card->dev->dma_mask = &omap_pcm_dmamask;
if (!card->dev->coherent_dma_mask)
if (!card->dev->dma_mask)
card->dev->dma_mask = &omap_pcm_dmamask;
if (!card->dev->coherent_dma_mask)
- card->dev->coherent_dma_mask = DMA_
32BIT_MASK
;
+ card->dev->coherent_dma_mask = DMA_
BIT_MASK(32)
;
if (dai->playback.channels_min) {
ret = omap_pcm_preallocate_dma_buffer(pcm,
if (dai->playback.channels_min) {
ret = omap_pcm_preallocate_dma_buffer(pcm,