diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 08:42:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-18 08:42:05 -0500 |
| commit | 1452556bebc302121eea5dfb3cbd464824406bb8 (patch) | |
| tree | 5fd1e8fc0d7bd4b1f12a026201ee0c44eb3aaff1 /sound/soc | |
| parent | 57512c6432783c9695ef54f875f705584c65c733 (diff) | |
| parent | f9ede4eca01cc64ce37549c282b6fde727c0ec84 (diff) | |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.33
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/s6000/s6000-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c index 83b8028e209d..0eb1722f6581 100644 --- a/sound/soc/s6000/s6000-pcm.c +++ b/sound/soc/s6000/s6000-pcm.c | |||
| @@ -423,7 +423,7 @@ static void s6000_pcm_free(struct snd_pcm *pcm) | |||
| 423 | snd_pcm_lib_preallocate_free_for_all(pcm); | 423 | snd_pcm_lib_preallocate_free_for_all(pcm); |
| 424 | } | 424 | } |
| 425 | 425 | ||
| 426 | static u64 s6000_pcm_dmamask = DMA_32BIT_MASK; | 426 | static u64 s6000_pcm_dmamask = DMA_BIT_MASK(32); |
| 427 | 427 | ||
| 428 | static int s6000_pcm_new(struct snd_card *card, | 428 | static int s6000_pcm_new(struct snd_card *card, |
| 429 | struct snd_soc_dai *dai, struct snd_pcm *pcm) | 429 | struct snd_soc_dai *dai, struct snd_pcm *pcm) |
| @@ -435,7 +435,7 @@ static int s6000_pcm_new(struct snd_card *card, | |||
| 435 | if (!card->dev->dma_mask) | 435 | if (!card->dev->dma_mask) |
| 436 | card->dev->dma_mask = &s6000_pcm_dmamask; | 436 | card->dev->dma_mask = &s6000_pcm_dmamask; |
| 437 | if (!card->dev->coherent_dma_mask) | 437 | if (!card->dev->coherent_dma_mask) |
| 438 | card->dev->coherent_dma_mask = DMA_32BIT_MASK; | 438 | card->dev->coherent_dma_mask = DMA_BIT_MASK(32); |
| 439 | 439 | ||
| 440 | if (params->dma_in) { | 440 | if (params->dma_in) { |
| 441 | s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in), | 441 | s6dmac_disable_chan(DMA_MASK_DMAC(params->dma_in), |