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
ALSA: asoc: fsl - merge structs snd_soc_codec_dai and snd_soc_cpu_dai.
[pandora-kernel.git]
/
sound
/
soc
/
fsl
/
fsl_dma.c
diff --git
a/sound/soc/fsl/fsl_dma.c
b/sound/soc/fsl/fsl_dma.c
index
78de716
..
da2bc59
100644
(file)
--- a/
sound/soc/fsl/fsl_dma.c
+++ b/
sound/soc/fsl/fsl_dma.c
@@
-282,7
+282,7
@@
static irqreturn_t fsl_dma_isr(int irq, void *dev_id)
* once for each .dai_link in the machine driver's snd_soc_machine
* structure.
*/
* once for each .dai_link in the machine driver's snd_soc_machine
* structure.
*/
-static int fsl_dma_new(struct snd_card *card, struct snd_soc_
codec_
dai *dai,
+static int fsl_dma_new(struct snd_card *card, struct snd_soc_dai *dai,
struct snd_pcm *pcm)
{
static u64 fsl_dma_dmamask = DMA_BIT_MASK(32);
struct snd_pcm *pcm)
{
static u64 fsl_dma_dmamask = DMA_BIT_MASK(32);