diff options
Diffstat (limited to 'sound/mips')
-rw-r--r-- | sound/mips/Kconfig | 5 | ||||
-rw-r--r-- | sound/mips/au1x00.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig index 0a0d5017a642..d2f615ab177a 100644 --- a/sound/mips/Kconfig +++ b/sound/mips/Kconfig | |||
@@ -23,12 +23,15 @@ config SND_SGI_HAL2 | |||
23 | 23 | ||
24 | 24 | ||
25 | config SND_AU1X00 | 25 | config SND_AU1X00 |
26 | tristate "Au1x00 AC97 Port Driver" | 26 | tristate "Au1x00 AC97 Port Driver (DEPRECATED)" |
27 | depends on MIPS_ALCHEMY | 27 | depends on MIPS_ALCHEMY |
28 | select SND_PCM | 28 | select SND_PCM |
29 | select SND_AC97_CODEC | 29 | select SND_AC97_CODEC |
30 | help | 30 | help |
31 | ALSA Sound driver for the Au1x00's AC97 port. | 31 | ALSA Sound driver for the Au1x00's AC97 port. |
32 | 32 | ||
33 | Newer drivers for ASoC are available, please do not use | ||
34 | this driver as it will be removed in the future. | ||
35 | |||
33 | endif # SND_MIPS | 36 | endif # SND_MIPS |
34 | 37 | ||
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index 446cf9748664..7567ebd71913 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c | |||
@@ -465,13 +465,13 @@ snd_au1000_pcm_new(struct snd_au1000 *au1000) | |||
465 | 465 | ||
466 | flags = claim_dma_lock(); | 466 | flags = claim_dma_lock(); |
467 | if ((au1000->stream[PLAYBACK]->dma = request_au1000_dma(DMA_ID_AC97C_TX, | 467 | if ((au1000->stream[PLAYBACK]->dma = request_au1000_dma(DMA_ID_AC97C_TX, |
468 | "AC97 TX", au1000_dma_interrupt, IRQF_DISABLED, | 468 | "AC97 TX", au1000_dma_interrupt, 0, |
469 | au1000->stream[PLAYBACK])) < 0) { | 469 | au1000->stream[PLAYBACK])) < 0) { |
470 | release_dma_lock(flags); | 470 | release_dma_lock(flags); |
471 | return -EBUSY; | 471 | return -EBUSY; |
472 | } | 472 | } |
473 | if ((au1000->stream[CAPTURE]->dma = request_au1000_dma(DMA_ID_AC97C_RX, | 473 | if ((au1000->stream[CAPTURE]->dma = request_au1000_dma(DMA_ID_AC97C_RX, |
474 | "AC97 RX", au1000_dma_interrupt, IRQF_DISABLED, | 474 | "AC97 RX", au1000_dma_interrupt, 0, |
475 | au1000->stream[CAPTURE])) < 0){ | 475 | au1000->stream[CAPTURE])) < 0){ |
476 | release_dma_lock(flags); | 476 | release_dma_lock(flags); |
477 | return -EBUSY; | 477 | return -EBUSY; |