diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-22 09:56:12 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 09:56:12 +0200 |
commit | af1910a817c5ad52c32dddacc1744cfa1b35889e (patch) | |
tree | 2d6504a2ac5971bb84e0172bbdd309b781048849 /sound/soc/fsl/fsl_dma.c | |
parent | 5495ffbd7b56d8bffebc5e30f03ea374590f1bb4 (diff) | |
parent | f648de832dbf6d1947ce5a7c0ed24a3a71d8545b (diff) |
Merge branch 'topic/asoc' into topic/remove-irqf_disable
Diffstat (limited to 'sound/soc/fsl/fsl_dma.c')
-rw-r--r-- | sound/soc/fsl/fsl_dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_dma.c b/sound/soc/fsl/fsl_dma.c index cb50598338e..ef15402a3bc 100644 --- a/sound/soc/fsl/fsl_dma.c +++ b/sound/soc/fsl/fsl_dma.c @@ -297,7 +297,6 @@ static irqreturn_t fsl_dma_isr(int irq, void *dev_id) static int fsl_dma_new(struct snd_soc_pcm_runtime *rtd) { struct snd_card *card = rtd->card->snd_card; - struct snd_soc_dai *dai = rtd->cpu_dai; struct snd_pcm *pcm = rtd->pcm; static u64 fsl_dma_dmamask = DMA_BIT_MASK(36); int ret; |