diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 14:22:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 14:22:37 +0200 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /sound/soc/blackfin/bf5xx-ac97-pcm.c | |
| parent | Merge branch 'for-2.6.30' into for-2.6.31 (diff) | |
| parent | Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-6967963d6d5cac40a091d075326f0e3ccb95c58a.tar.xz linux-6967963d6d5cac40a091d075326f0e3ccb95c58a.zip | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/blackfin/bf5xx-ac97-pcm.c')
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ac97-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97-pcm.c b/sound/soc/blackfin/bf5xx-ac97-pcm.c index 8cfed1a5dcbe..cf0dfb7ca221 100644 --- a/sound/soc/blackfin/bf5xx-ac97-pcm.c +++ b/sound/soc/blackfin/bf5xx-ac97-pcm.c @@ -413,7 +413,7 @@ static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm) sport_done(sport_handle); } -static u64 bf5xx_pcm_dmamask = DMA_32BIT_MASK; +static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32); int bf5xx_pcm_ac97_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_pcm *pcm) @@ -424,7 +424,7 @@ int bf5xx_pcm_ac97_new(struct snd_card *card, struct snd_soc_dai *dai, if (!card->dev->dma_mask) card->dev->dma_mask = &bf5xx_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 = bf5xx_pcm_preallocate_dma_buffer(pcm, |