diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2008-07-29 11:42:24 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-29 21:32:14 +0200 |
| commit | 8a33de9e51673dbdadb552d888a4544aefe0c31d (patch) | |
| tree | eadf70da45f3da95ae0aca462a19ecb60678bfe6 /sound/soc/pxa/pxa2xx-pcm.c | |
| parent | f6154d6d007c69a330acc9021ec77cca5da9dc4c (diff) | |
| download | kernel_samsung_aries-8a33de9e51673dbdadb552d888a4544aefe0c31d.zip kernel_samsung_aries-8a33de9e51673dbdadb552d888a4544aefe0c31d.tar.gz kernel_samsung_aries-8a33de9e51673dbdadb552d888a4544aefe0c31d.tar.bz2 | |
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>
Diffstat (limited to 'sound/soc/pxa/pxa2xx-pcm.c')
| -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 4345f38..771c592 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) static u64 pxa2xx_pcm_dmamask = DMA_32BIT_MASK; -int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, +static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_pcm *pcm) { int ret = 0; @@ -360,7 +360,7 @@ int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, struct snd_soc_platform pxa2xx_soc_platform = { .name = "pxa2xx-audio", .pcm_ops = &pxa2xx_pcm_ops, - .pcm_new = pxa2xx_pcm_new, + .pcm_new = pxa2xx_soc_pcm_new, .pcm_free = pxa2xx_pcm_free_dma_buffers, }; EXPORT_SYMBOL_GPL(pxa2xx_soc_platform); |