diff options
author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-07-29 06:42:24 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-29 15:32:14 -0400 |
commit | 8a33de9e51673dbdadb552d888a4544aefe0c31d (patch) | |
tree | eadf70da45f3da95ae0aca462a19ecb60678bfe6 | |
parent | f6154d6d007c69a330acc9021ec77cca5da9dc4c (diff) |
ALSA: ASoC: Permit simultaneous compilation of both PXA AC97 drivers
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r-- | sound/soc/pxa/pxa2xx-pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 4345f387fe41..771c592b0429 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c | |||
@@ -330,7 +330,7 @@ static void pxa2xx_pcm_free_dma_buffers(struct snd_pcm *pcm) | |||
330 | 330 | ||
331 | static u64 pxa2xx_pcm_dmamask = DMA_32BIT_MASK; | 331 | static u64 pxa2xx_pcm_dmamask = DMA_32BIT_MASK; |
332 | 332 | ||
333 | int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | 333 | static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, |
334 | struct snd_pcm *pcm) | 334 | struct snd_pcm *pcm) |
335 | { | 335 | { |
336 | int ret = 0; | 336 | int ret = 0; |
@@ -360,7 +360,7 @@ int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, | |||
360 | struct snd_soc_platform pxa2xx_soc_platform = { | 360 | struct snd_soc_platform pxa2xx_soc_platform = { |
361 | .name = "pxa2xx-audio", | 361 | .name = "pxa2xx-audio", |
362 | .pcm_ops = &pxa2xx_pcm_ops, | 362 | .pcm_ops = &pxa2xx_pcm_ops, |
363 | .pcm_new = pxa2xx_pcm_new, | 363 | .pcm_new = pxa2xx_soc_pcm_new, |
364 | .pcm_free = pxa2xx_pcm_free_dma_buffers, | 364 | .pcm_free = pxa2xx_pcm_free_dma_buffers, |
365 | }; | 365 | }; |
366 | EXPORT_SYMBOL_GPL(pxa2xx_soc_platform); | 366 | EXPORT_SYMBOL_GPL(pxa2xx_soc_platform); |