Merge branch 'for-3.1' into for-3.2

git-mirror · Aug 31, 2011 · efd614a · efd614a
2 parents da1c6ea + 117ef95
commit efd614a
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c
@@ -240,7 +240,6 @@ static int ssi_irq = 0;
 
 static int imx_pcm_fiq_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;
 	struct snd_pcm_substream *substream;