Merge branch 'for-3.1' into for-3.2

efd614ac · Mark Brown · da1c6ea6 · 117ef957 · efd614ac
Commit efd614ac authored Aug 31, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

sound/soc/imx/imx-pcm-fiq.c sound/soc/imx/imx-pcm-fiq.c +0 -1

No files found.
--- 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;