summaryrefslogtreecommitdiffstats
path: root/sound/soc/imx
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-31 09:57:44 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-31 09:57:44 +0100
commitefd614ac067a30b5541640e89d08f7afa7601f24 (patch)
tree7cac6108a995a6cad696499f397bc6eb4ce1dfb4 /sound/soc/imx
parentda1c6ea6cf85544292c30295c70a89e8555358bc (diff)
parent117ef9570bf3a332eca443231f41dd3a52fcfb2c (diff)
downloadlinux-efd614ac067a30b5541640e89d08f7afa7601f24.tar.bz2
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/imx')
-rw-r--r--sound/soc/imx/imx-pcm-fiq.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/imx/imx-pcm-fiq.c b/sound/soc/imx/imx-pcm-fiq.c
index ac790e87e231..c8527ead3736 100644
--- 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;