git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[pandora-kernel.git]
/
sound
/
soc
/
pxa
/
pxa2xx-pcm.c
diff --git
a/sound/soc/pxa/pxa2xx-pcm.c
b/sound/soc/pxa/pxa2xx-pcm.c
index
01ad7bf
..
2df03ee
100644
(file)
--- 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_
codec_
dai *dai,
+int pxa2xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
struct snd_pcm *pcm)
{
int ret = 0;